diff --git a/tigervnc.spec b/tigervnc.spec index d4d273536d1e5a683cc98f9f37491ded00258da0..2a9fac58f124864431104f312ecffad85e76e575 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -188,10 +188,10 @@ for all in `find . -type f -perm -001`; do done %patch100 -p1 -b .xserver120 %patch101 -p1 -b .rpath -%patch110 -p1 -b .xorg-CVE-2023-5367 +#%patch110 -p1 -b .xorg-CVE-2023-5367 %patch111 -p1 -b .xorg-CVE-2023-5380 -%patch112 -p1 -b .xorg-CVE-2023-6377 -%patch113 -p1 -b .xorg-CVE-2023-6478 +#%patch112 -p1 -b .xorg-CVE-2023-6377 +#%patch113 -p1 -b .xorg-CVE-2023-6478 popd # Don't use shebang in vncserver script. diff --git a/xorg-CVE-2023-6377.patch b/xorg-CVE-2023-6377.patch index cf5e17095cb7efd2d3e12bfca9d5b37bf3c6caaf..f3f14718e5eb717e4913d552f13d8ec78fd9f08f 100644 --- a/xorg-CVE-2023-6377.patch +++ b/xorg-CVE-2023-6377.patch @@ -22,9 +22,9 @@ diff --git a/Xi/exevents.c b/Xi/exevents.c index dcd4efb3bc..54ea11a938 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c -@@ -611,13 +611,13 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to) +@@ -567,13 +567,13 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to) } - + if (from->button->xkb_acts) { - if (!to->button->xkb_acts) { - to->button->xkb_acts = calloc(1, sizeof(XkbAction)); @@ -38,9 +38,9 @@ index dcd4efb3bc..54ea11a938 100644 + memset(to->button->xkb_acts, 0, maxbuttons * sizeof(XkbAction)); memcpy(to->button->xkb_acts, from->button->xkb_acts, - sizeof(XkbAction)); -+ from->button->numButtons * sizeof(XkbAction)); ++ from->button->numButtons * sizeof(XkbAction)); } - else { + else free(to->button->xkb_acts); diff --git a/dix/devices.c b/dix/devices.c index b063128df0..3f3224d626 100644