package/x11r7/xserver_xorg-server: bump version to 1.20.10
PATCH 1/1 package/x11r7/xserver_xorg-server: bump version to 1.20.10
Release notes:
https://lists.x.org/archives/xorg-announce/2020-December/003067.html
Remove patches which were applied upstream.
--- ...Info-and-SetDeviceIndicators-heap-ov.patch | 100 ------------- ...heck-SetMap-request-length-carefully.patch | 131 ------------------ .../xserver_xorg-server.hash | 6 +- .../xserver_xorg-server.mk | 2 +- 4 files changed, 4 insertions(+), 235 deletions(-) delete mode 100644 package/x11r7/xserver_xorg-server/0007-Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch delete mode 100644 package/x11r7/xserver_xorg-server/0008-Check-SetMap-request-length-carefully.patch
package/x11r7/xserver_xorg-server/0007-Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch deleted +0 -100
@@ -1,100 +0,0 @@ -From 87c64fc5b0db9f62f4e361444f4b60501ebf67b9 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <[email protected]> -Date: Sun, 11 Oct 2020 17:05:09 +0200 -Subject: [PATCH] Fix XkbSetDeviceInfo() and SetDeviceIndicators() heap - overflows - -ZDI-CAN 11389 / CVE-2020-25712 - -This vulnerability was discovered by: -Jan-Niklas Sohn working with Trend Micro Zero Day Initiative - -Signed-off-by: Matthieu Herrb <[email protected]> -Signed-off-by: Peter Korsgaard <[email protected]> ---- - xkb/xkb.c | 26 +++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index 8e016cd74..f54cc97f8 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -6536,7 +6536,9 @@ SetDeviceIndicators(char *wire, - unsigned changed, - int num, - int *status_rtrn, -- ClientPtr client, xkbExtensionDeviceNotify * ev) -+ ClientPtr client, -+ xkbExtensionDeviceNotify * ev, -+ xkbSetDeviceInfoReq * stuff) - { - xkbDeviceLedsWireDesc *ledWire; - int i; -@@ -6557,6 +6559,11 @@ SetDeviceIndicators(char *wire, - xkbIndicatorMapWireDesc *mapWire; - XkbSrvLedInfoPtr sli; - -+ if (!_XkbCheckRequestBounds(client, stuff, ledWire, ledWire + 1)) { -+ *status_rtrn = BadLength; -+ return (char *) ledWire; -+ } -+ - namec = mapc = statec = 0; - sli = XkbFindSrvLedInfo(dev, ledWire->ledClass, ledWire->ledID, - XkbXI_IndicatorMapsMask); -@@ -6575,6 +6582,10 @@ SetDeviceIndicators(char *wire, - memset((char *) sli->names, 0, XkbNumIndicators * sizeof(Atom)); - for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { - if (ledWire->namesPresent & bit) { -+ if (!_XkbCheckRequestBounds(client, stuff, atomWire, atomWire + 1)) { -+ *status_rtrn = BadLength; -+ return (char *) atomWire; -+ } - sli->names[n] = (Atom) *atomWire; - if (sli->names[n] == None) - ledWire->namesPresent &= ~bit; -@@ -6592,6 +6603,10 @@ SetDeviceIndicators(char *wire, - if (ledWire->mapsPresent) { - for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { - if (ledWire->mapsPresent & bit) { -+ if (!_XkbCheckRequestBounds(client, stuff, mapWire, mapWire + 1)) { -+ *status_rtrn = BadLength; -+ return (char *) mapWire; -+ } - sli->maps[n].flags = mapWire->flags; - sli->maps[n].which_groups = mapWire->whichGroups; - sli->maps[n].groups = mapWire->groups; -@@ -6671,7 +6686,7 @@ _XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, - ed.deviceID = dev->id; - wire = (char *) &stuff[1]; - if (stuff->change & XkbXI_ButtonActionsMask) { -- int nBtns, sz, i; -+ int nBtns, sz, i; - XkbAction *acts; - DeviceIntPtr kbd; - -@@ -6683,7 +6698,11 @@ _XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, - return BadAlloc; - dev->button->xkb_acts = acts; - } -+ if (stuff->firstBtn + stuff->nBtns > nBtns) -+ return BadValue; - sz = stuff->nBtns * SIZEOF(xkbActionWireDesc); -+ if (!_XkbCheckRequestBounds(client, stuff, wire, (char *) wire + sz)) -+ return BadLength; - memcpy((char *) &acts[stuff->firstBtn], (char *) wire, sz); - wire += sz; - ed.reason |= XkbXI_ButtonActionsMask; -@@ -6704,7 +6723,8 @@ _XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, - int status = Success; - - wire = SetDeviceIndicators(wire, dev, stuff->change, -- stuff->nDeviceLedFBs, &status, client, &ed); -+ stuff->nDeviceLedFBs, &status, client, &ed, -+ stuff); - if (status != Success) - return status; - } --- -2.20.1 -
package/x11r7/xserver_xorg-server/0008-Check-SetMap-request-length-carefully.patch deleted +0 -131
131 lines not on this page · raw message
package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +3 -3
@@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2020-August/003059.html -sha256 e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571 xorg-server-1.20.9.tar.bz2 -sha512 d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 xorg-server-1.20.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-December/003067.html +sha256 977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99 xorg-server-1.20.10.tar.bz2 +sha512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae xorg-server-1.20.10.tar.bz2 # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.20.9 +XSERVER_XORG_SERVER_VERSION = 1.20.10 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT
Signature · 1 line
2.27.0
Thomas Petazzoni
AppliedPATCH 1/1 package/x11r7/xserver_xorg-server: bump version to 1.20.10
Quoted 6 lines · On Thu, 3 Dec 2020 19:20:26 +0100 Bernd Kuhls <[email protected]> wrote:
Release notes:
https://lists.x.org/archives/xorg-announce/2020-December/003067.htmlRemove patches which were applied upstream.
Signed-off-by Bernd Kuhls <[email protected]>
Quoted 8 lines
--- ...Info-and-SetDeviceIndicators-heap-ov.patch | 100 ------------- ...heck-SetMap-request-length-carefully.patch | 131 ------------------ .../xserver_xorg-server.hash | 6 +- .../xserver_xorg-server.mk | 2 +- 4 files changed, 4 insertions(+), 235 deletions(-) delete mode 100644 package/x11r7/xserver_xorg-server/0007-Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch delete mode 100644 package/x11r7/xserver_xorg-server/0008-Check-SetMap-request-length-carefully.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/x11r7/xserver_xorg-server: bump version to 1.20.10
In reply to Bernd KuhlsQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Release notes:
https://lists.x.org/archives/xorg-announce/2020-December/003067.htmlRemove patches which were applied upstream.
Signed-off-by Bernd Kuhls <[email protected]>
Committed to 2020.02.x, 2020.08.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard