diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-07-13 19:56:59 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-07-14 09:00:16 +0200 |
commit | 8db980621c64bad4de1a42f9c5d110eef12758b8 (patch) | |
tree | 2e89d361204a545b9abcdb5a7035c8ca4a9cabde /source/x/x11/patch/xorg-server/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch | |
parent | bee3d6c81b37e0eb578c0aaf4dca8202b62ab3c0 (diff) | |
download | current-8db980621c64bad4de1a42f9c5d110eef12758b8.tar.gz current-8db980621c64bad4de1a42f9c5d110eef12758b8.tar.xz |
Wed Jul 13 19:56:59 UTC 202220220713195659
a/inih-56-x86_64-1.txz: Upgraded.
a/kernel-firmware-20220710_dfa2931-noarch-1.txz: Upgraded.
a/kernel-generic-5.18.11-x86_64-1.txz: Upgraded.
a/kernel-huge-5.18.11-x86_64-1.txz: Upgraded.
a/kernel-modules-5.18.11-x86_64-1.txz: Upgraded.
ap/mpg123-1.30.1-x86_64-1.txz: Upgraded.
d/git-2.37.1-x86_64-1.txz: Upgraded.
d/kernel-headers-5.18.11-x86-1.txz: Upgraded.
d/mercurial-6.2-x86_64-1.txz: Upgraded.
k/kernel-source-5.18.11-noarch-1.txz: Upgraded.
kde/bluedevil-5.25.3-x86_64-1.txz: Upgraded.
kde/breeze-5.25.3-x86_64-1.txz: Upgraded.
kde/breeze-grub-5.25.3-x86_64-1.txz: Upgraded.
kde/breeze-gtk-5.25.3-x86_64-1.txz: Upgraded.
kde/drkonqi-5.25.3-x86_64-1.txz: Upgraded.
kde/kactivitymanagerd-5.25.3-x86_64-1.txz: Upgraded.
kde/kde-cli-tools-5.25.3-x86_64-1.txz: Upgraded.
kde/kde-gtk-config-5.25.3-x86_64-1.txz: Upgraded.
kde/kdecoration-5.25.3-x86_64-1.txz: Upgraded.
kde/kdeplasma-addons-5.25.3-x86_64-1.txz: Upgraded.
kde/kgamma5-5.25.3-x86_64-1.txz: Upgraded.
kde/khotkeys-5.25.3-x86_64-1.txz: Upgraded.
kde/kinfocenter-5.25.3-x86_64-1.txz: Upgraded.
kde/kmenuedit-5.25.3-x86_64-1.txz: Upgraded.
kde/kscreen-5.25.3-x86_64-1.txz: Upgraded.
kde/kscreenlocker-5.25.3-x86_64-1.txz: Upgraded.
kde/ksshaskpass-5.25.3-x86_64-1.txz: Upgraded.
kde/ksystemstats-5.25.3-x86_64-1.txz: Upgraded.
kde/kwallet-pam-5.25.3-x86_64-1.txz: Upgraded.
kde/kwayland-integration-5.25.3-x86_64-1.txz: Upgraded.
kde/kwin-5.25.3-x86_64-1.txz: Upgraded.
kde/kwrited-5.25.3-x86_64-1.txz: Upgraded.
kde/layer-shell-qt-5.25.3-x86_64-1.txz: Upgraded.
kde/libkscreen-5.25.3-x86_64-1.txz: Upgraded.
kde/libksysguard-5.25.3-x86_64-1.txz: Upgraded.
kde/milou-5.25.3-x86_64-1.txz: Upgraded.
kde/oxygen-5.25.3-x86_64-1.txz: Upgraded.
kde/oxygen-sounds-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-browser-integration-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-desktop-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-disks-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-firewall-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-integration-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-nm-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-pa-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-sdk-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-systemmonitor-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-vault-5.25.3-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.25.3.1-x86_64-1.txz: Upgraded.
kde/plasma-workspace-wallpapers-5.25.3-x86_64-1.txz: Upgraded.
kde/polkit-kde-agent-1-5.25.3-x86_64-1.txz: Upgraded.
kde/powerdevil-5.25.3-x86_64-1.txz: Upgraded.
kde/qqc2-breeze-style-5.25.3-x86_64-1.txz: Upgraded.
kde/sddm-kcm-5.25.3-x86_64-1.txz: Upgraded.
kde/systemsettings-5.25.3-x86_64-1.txz: Upgraded.
kde/xdg-desktop-portal-kde-5.25.3-x86_64-1.txz: Upgraded.
l/SDL2_mixer-2.6.1-x86_64-1.txz: Upgraded.
l/gtk4-4.6.6-x86_64-2.txz: Rebuilt.
Drop embedded pango library and use "unshare -n" to prevent the issue from
happening again.
l/libuv-1.44.2-x86_64-1.txz: Upgraded.
l/pango-1.50.8-x86_64-1.txz: Upgraded.
l/pipewire-0.3.55-x86_64-1.txz: Upgraded.
x/font-util-1.3.3-x86_64-1.txz: Upgraded.
x/xorg-server-1.20.14-x86_64-4.txz: Rebuilt.
xkb: switch to array index loops to moving pointers.
xkb: add request length validation for XkbSetGeometry.
xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2319
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2320
(* Security fix *)
x/xorg-server-xephyr-1.20.14-x86_64-4.txz: Rebuilt.
x/xorg-server-xnest-1.20.14-x86_64-4.txz: Rebuilt.
x/xorg-server-xvfb-1.20.14-x86_64-4.txz: Rebuilt.
xap/mozilla-thunderbird-102.0.2-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/thunderbird/102.0.2/releasenotes/
xfce/xfce4-settings-4.16.3-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/x/x11/patch/xorg-server/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch')
-rw-r--r-- | source/x/x11/patch/xorg-server/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/source/x/x11/patch/xorg-server/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch b/source/x/x11/patch/xorg-server/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch new file mode 100644 index 000000000..0efddcf56 --- /dev/null +++ b/source/x/x11/patch/xorg-server/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch @@ -0,0 +1,75 @@ +From f1070c01d616c5f21f939d5ebc533738779451ac Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue, 5 Jul 2022 12:40:47 +1000 +Subject: [PATCH] xkb: switch to array index loops to moving pointers + +Most similar loops here use a pointer that advances with each loop +iteration, let's do the same here for consistency. + +No functional changes. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Olivier Fourdan <ofourdan@redhat.com> +--- + xkb/xkb.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index a29262c24..64e52611e 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -5368,16 +5368,16 @@ _CheckSetSections(XkbGeometryPtr geom, + row->left = rWire->left; + row->vertical = rWire->vertical; + kWire = (xkbKeyWireDesc *) &rWire[1]; +- for (k = 0; k < rWire->nKeys; k++) { ++ for (k = 0; k < rWire->nKeys; k++, kWire++) { + XkbKeyPtr key; + + key = XkbAddGeomKey(row); + if (!key) + return BadAlloc; +- memcpy(key->name.name, kWire[k].name, XkbKeyNameLength); +- key->gap = kWire[k].gap; +- key->shape_ndx = kWire[k].shapeNdx; +- key->color_ndx = kWire[k].colorNdx; ++ memcpy(key->name.name, kWire->name, XkbKeyNameLength); ++ key->gap = kWire->gap; ++ key->shape_ndx = kWire->shapeNdx; ++ key->color_ndx = kWire->colorNdx; + if (key->shape_ndx >= geom->num_shapes) { + client->errorValue = _XkbErrCode3(0x10, key->shape_ndx, + geom->num_shapes); +@@ -5389,7 +5389,7 @@ _CheckSetSections(XkbGeometryPtr geom, + return BadMatch; + } + } +- rWire = (xkbRowWireDesc *) &kWire[rWire->nKeys]; ++ rWire = (xkbRowWireDesc *)kWire; + } + wire = (char *) rWire; + if (sWire->nDoodads > 0) { +@@ -5454,16 +5454,16 @@ _CheckSetShapes(XkbGeometryPtr geom, + return BadAlloc; + ol->corner_radius = olWire->cornerRadius; + ptWire = (xkbPointWireDesc *) &olWire[1]; +- for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++) { +- pt->x = ptWire[p].x; +- pt->y = ptWire[p].y; ++ for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++, ptWire++) { ++ pt->x = ptWire->x; ++ pt->y = ptWire->y; + if (client->swapped) { + swaps(&pt->x); + swaps(&pt->y); + } + } + ol->num_points = olWire->nPoints; +- olWire = (xkbOutlineWireDesc *) (&ptWire[olWire->nPoints]); ++ olWire = (xkbOutlineWireDesc *)ptWire; + } + if (shapeWire->primaryNdx != XkbNoShape) + shape->primary = &shape->outlines[shapeWire->primaryNdx]; +-- +GitLab + |