From 564e2f9732ac4318bb5923dd1ff771514c9afd2f Mon Sep 17 00:00:00 2001 From: Li Zhou Date: Tue, 7 Apr 2015 15:49:56 +0800 Subject: xorg-server: Security Advisory - xorg-server - CVE-2015-0255 Updated x11-server packages fix security vulnerability: Olivier Fourdan from Red Hat has discovered a protocol handling issue in the way the X server code base handles the XkbSetGeometry request, where the server trusts the client to send valid string lengths. A malicious client with string lengths exceeding the request length can cause the server to copy adjacent memory data into the XKB structs. This data is then available to the client via the XkbGetGeometry request. This can lead to information disclosure issues, as well as possibly a denial of service if a similar request can cause the server to crash (CVE-2015-0255). Signed-off-by: Li Zhou Signed-off-by: Richard Purdie --- ...Check-strings-length-against-request-size.patch | 145 +++++++++++++++++++++ ...wap-XkbSetGeometry-data-in-the-input-buff.patch | 109 ++++++++++++++++ .../xorg-xserver/xserver-xorg_1.16.3.bb | 2 + 3 files changed, 256 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Check-strings-length-against-request-size.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Check-strings-length-against-request-size.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Check-strings-length-against-request-size.patch new file mode 100644 index 0000000000..b0e2bcad43 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Check-strings-length-against-request-size.patch @@ -0,0 +1,145 @@ +From 20079c36cf7d377938ca5478447d8b9045cb7d43 Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Fri, 16 Jan 2015 08:44:45 +0100 +Subject: [PATCH] xkb: Check strings length against request size + +Ensure that the given strings length in an XkbSetGeometry request remain +within the limits of the size of the request. + +Signed-off-by: Olivier Fourdan +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer + +Upstream-Status: backport + +Signed-off-by: Li Zhou +--- + xkb/xkb.c | 65 +++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 25 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index b9a3ac4..f3988f9 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -4957,25 +4957,29 @@ ProcXkbGetGeometry(ClientPtr client) + + /***====================================================================***/ + +-static char * +-_GetCountedString(char **wire_inout, Bool swap) ++static Status ++_GetCountedString(char **wire_inout, ClientPtr client, char **str) + { +- char *wire, *str; ++ char *wire, *next; + CARD16 len; + + wire = *wire_inout; + len = *(CARD16 *) wire; +- if (swap) { ++ if (client->swapped) { + swaps(&len); + } +- str = malloc(len + 1); +- if (str) { +- memcpy(str, &wire[2], len); +- str[len] = '\0'; +- } +- wire += XkbPaddedSize(len + 2); +- *wire_inout = wire; +- return str; ++ next = wire + XkbPaddedSize(len + 2); ++ /* Check we're still within the size of the request */ ++ if (client->req_len < ++ bytes_to_int32(next - (char *) client->requestBuffer)) ++ return BadValue; ++ *str = malloc(len + 1); ++ if (!*str) ++ return BadAlloc; ++ memcpy(*str, &wire[2], len); ++ *(*str + len) = '\0'; ++ *wire_inout = next; ++ return Success; + } + + static Status +@@ -4987,6 +4991,7 @@ _CheckSetDoodad(char **wire_inout, + xkbAnyDoodadWireDesc any; + xkbTextDoodadWireDesc text; + XkbDoodadPtr doodad; ++ Status status; + + dWire = (xkbDoodadWireDesc *) (*wire_inout); + any = dWire->any; +@@ -5036,8 +5041,14 @@ _CheckSetDoodad(char **wire_inout, + doodad->text.width = text.width; + doodad->text.height = text.height; + doodad->text.color_ndx = dWire->text.colorNdx; +- doodad->text.text = _GetCountedString(&wire, client->swapped); +- doodad->text.font = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &doodad->text.text); ++ if (status != Success) ++ return status; ++ status = _GetCountedString(&wire, client, &doodad->text.font); ++ if (status != Success) { ++ free (doodad->text.text); ++ return status; ++ } + break; + case XkbIndicatorDoodad: + if (dWire->indicator.onColorNdx >= geom->num_colors) { +@@ -5072,7 +5083,9 @@ _CheckSetDoodad(char **wire_inout, + } + doodad->logo.color_ndx = dWire->logo.colorNdx; + doodad->logo.shape_ndx = dWire->logo.shapeNdx; +- doodad->logo.logo_name = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &doodad->logo.logo_name); ++ if (status != Success) ++ return status; + break; + default: + client->errorValue = _XkbErrCode2(0x4F, dWire->any.type); +@@ -5304,18 +5317,20 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client) + char *wire; + + wire = (char *) &req[1]; +- geom->label_font = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &geom->label_font); ++ if (status != Success) ++ return status; + + for (i = 0; i < req->nProperties; i++) { + char *name, *val; + +- name = _GetCountedString(&wire, client->swapped); +- if (!name) +- return BadAlloc; +- val = _GetCountedString(&wire, client->swapped); +- if (!val) { ++ status = _GetCountedString(&wire, client, &name); ++ if (status != Success) ++ return status; ++ status = _GetCountedString(&wire, client, &val); ++ if (status != Success) { + free(name); +- return BadAlloc; ++ return status; + } + if (XkbAddGeomProperty(geom, name, val) == NULL) { + free(name); +@@ -5349,9 +5364,9 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client) + for (i = 0; i < req->nColors; i++) { + char *name; + +- name = _GetCountedString(&wire, client->swapped); +- if (!name) +- return BadAlloc; ++ status = _GetCountedString(&wire, client, &name); ++ if (status != Success) ++ return status; + if (!XkbAddGeomColor(geom, name, geom->num_colors)) { + free(name); + return BadAlloc; +-- +1.7.9.5 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch new file mode 100644 index 0000000000..c841dbe87e --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch @@ -0,0 +1,109 @@ +From 81c90dc8f0aae3b65730409b1b615b5fa7280ebd Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Fri, 16 Jan 2015 20:08:59 +0100 +Subject: [PATCH] xkb: Don't swap XkbSetGeometry data in the input buffer + +The XkbSetGeometry request embeds data which needs to be swapped when the +server and the client have different endianess. + +_XkbSetGeometry() invokes functions that swap these data directly in the +input buffer. + +However, ProcXkbSetGeometry() may call _XkbSetGeometry() more than once +(if there is more than one keyboard), thus causing on swapped clients the +same data to be swapped twice in memory, further causing a server crash +because the strings lengths on the second time are way off bounds. + +To allow _XkbSetGeometry() to run reliably more than once with swapped +clients, do not swap the data in the buffer, use variables instead. + +Signed-off-by: Olivier Fourdan +Signed-off-by: Peter Hutterer + +Upstream-Status: backport + +Signed-off-by: Li Zhou +--- + xkb/xkb.c | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index 15c7f34..b9a3ac4 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -4961,14 +4961,13 @@ static char * + _GetCountedString(char **wire_inout, Bool swap) + { + char *wire, *str; +- CARD16 len, *plen; ++ CARD16 len; + + wire = *wire_inout; +- plen = (CARD16 *) wire; ++ len = *(CARD16 *) wire; + if (swap) { +- swaps(plen); ++ swaps(&len); + } +- len = *plen; + str = malloc(len + 1); + if (str) { + memcpy(str, &wire[2], len); +@@ -4985,25 +4984,28 @@ _CheckSetDoodad(char **wire_inout, + { + char *wire; + xkbDoodadWireDesc *dWire; ++ xkbAnyDoodadWireDesc any; ++ xkbTextDoodadWireDesc text; + XkbDoodadPtr doodad; + + dWire = (xkbDoodadWireDesc *) (*wire_inout); ++ any = dWire->any; + wire = (char *) &dWire[1]; + if (client->swapped) { +- swapl(&dWire->any.name); +- swaps(&dWire->any.top); +- swaps(&dWire->any.left); +- swaps(&dWire->any.angle); ++ swapl(&any.name); ++ swaps(&any.top); ++ swaps(&any.left); ++ swaps(&any.angle); + } + CHK_ATOM_ONLY(dWire->any.name); +- doodad = XkbAddGeomDoodad(geom, section, dWire->any.name); ++ doodad = XkbAddGeomDoodad(geom, section, any.name); + if (!doodad) + return BadAlloc; + doodad->any.type = dWire->any.type; + doodad->any.priority = dWire->any.priority; +- doodad->any.top = dWire->any.top; +- doodad->any.left = dWire->any.left; +- doodad->any.angle = dWire->any.angle; ++ doodad->any.top = any.top; ++ doodad->any.left = any.left; ++ doodad->any.angle = any.angle; + switch (doodad->any.type) { + case XkbOutlineDoodad: + case XkbSolidDoodad: +@@ -5026,12 +5028,13 @@ _CheckSetDoodad(char **wire_inout, + dWire->text.colorNdx); + return BadMatch; + } ++ text = dWire->text; + if (client->swapped) { +- swaps(&dWire->text.width); +- swaps(&dWire->text.height); ++ swaps(&text.width); ++ swaps(&text.height); + } +- doodad->text.width = dWire->text.width; +- doodad->text.height = dWire->text.height; ++ doodad->text.width = text.width; ++ doodad->text.height = text.height; + doodad->text.color_ndx = dWire->text.colorNdx; + doodad->text.text = _GetCountedString(&wire, client->swapped); + doodad->text.font = _GetCountedString(&wire, client->swapped); +-- +1.7.9.5 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb index 9d9ede2afc..cfbc491fcc 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb @@ -6,6 +6,8 @@ SRC_URI += "file://fix_open_max_preprocessor_error.patch \ file://xshmfence-option.patch \ file://Fix-subwindow-in-Xi-emulated-events.patch \ file://xtrans.patch \ + file://0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch \ + file://0001-xkb-Check-strings-length-against-request-size.patch \ " SRC_URI[md5sum] = "afd93977235584a9caa7528a737c1b52" -- cgit v1.2.3 0%;'/> -rw-r--r--packages/linux/devkitidp-pxa255-kernel_2.6.11.bb47
-rw-r--r--packages/linux/ep93xx-kernel/.mtn2git_empty0
-rw-r--r--packages/linux/ep93xx-kernel/defconfig1465
-rw-r--r--packages/linux/ep93xx-kernel/linux-2.6.15-ep93xx-gao19.diff43746
-rw-r--r--packages/linux/ep93xx-kernel_2.6.15.bb29
-rw-r--r--packages/linux/files/.mtn2git_empty0
-rw-r--r--packages/linux/files/ipaq-hal.init14
-rw-r--r--packages/linux/files/ir240_sys_max_tx-2.diff110
-rw-r--r--packages/linux/files/ir241_qos_param-2.diff164
-rw-r--r--packages/linux/files/iw240_we15-6.diff399
-rw-r--r--packages/linux/files/iw240_we18-5.diff421
-rw-r--r--packages/linux/files/iw241_we16-6.diff667
-rw-r--r--packages/linux/files/iw249_we16-6.diff670
-rw-r--r--packages/linux/files/iw249_we17-13.diff768
-rw-r--r--packages/linux/files/iw_handlers.w13-5.diff1513
-rw-r--r--packages/linux/files/iw_handlers.w14-5.diff838
-rw-r--r--packages/linux/files/linux-2.4-cpufreq.patch20
-rw-r--r--packages/linux/files/linux-2.4-mmc-debugging.patch15
-rw-r--r--packages/linux/files/linux-2.4-no-short-loads.patch18
-rw-r--r--packages/linux/files/linux-2.4-usb-gadget.patch29506
-rw-r--r--packages/linux/files/linux-2.4.18-list_move.patch32
-rw-r--r--packages/linux/files/mipv6-1.1-v2.4.25.patch19832
-rw-r--r--packages/linux/files/mipv6-1.1-v2.4.27.patch19736
-rw-r--r--packages/linux/files/usb-gadget-ether-compat.patch30
-rw-r--r--packages/linux/gumstix-2.6.5-gnalm1-gum0/.mtn2git_empty0
-rw-r--r--packages/linux/gumstix-2.6.5-gnalm1-gum0/defconfig777
-rw-r--r--packages/linux/gumstix-2.6.5-gnalm1-gum0/linux-2.6.5-gnalm1.patch20991
-rw-r--r--packages/linux/gumstix_2.6.5-gnalm1-gum0.bb29
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.1/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.1/defconfig-ipaqpxa1578
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.4/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h39001578
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.4/mmc_h5400.patch20
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.5/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.5/defconfig-h39001447
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.6/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.6/defconfig-h39001468
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh39/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh39/defconfig-h39001488
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h39001627
-rw-r--r--packages/linux/handhelds-pxa-2.6-2.6.12-hh3/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.6-2.6.12-hh3/fix-extraversion.patch11
-rw-r--r--packages/linux/handhelds-pxa-2.6/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.6/defconfig1328
-rw-r--r--packages/linux/handhelds-pxa-2.6/defconfig-ipaq-pxa-2.61304
-rw-r--r--packages/linux/handhelds-pxa-2.6/defconfig-ipaq-pxa-2.6_2.6.8.1-hh01382
-rw-r--r--packages/linux/handhelds-pxa-2.6/h2200/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.6/h2200/defconfig1512
-rw-r--r--packages/linux/handhelds-pxa-2.6/ipaq-pxa270/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig1447
-rw-r--r--packages/linux/handhelds-pxa-2.6/pitre-tls-2651.patch294
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb25
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb25
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb25
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb26
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb25
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb25
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb27
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb30
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb30
-rw-r--r--packages/linux/handhelds-pxa-2.6_cvs.bb42
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb65
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb68
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb67
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb70
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb70
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb73
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/defconfig-ipaqsa1505
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/disable-pcmcia-probe.patch17
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/ipsec.patch1446
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/mkdep.patch16
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.1/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.1/defconfig-ipaqsa1508
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h36001464
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h36001475
-rw-r--r--packages/linux/handhelds-sa-2.6/.mtn2git_empty0
-rw-r--r--packages/linux/handhelds-sa-2.6/defconfig-jornada56x877
-rw-r--r--packages/linux/handhelds-sa-2.6_cvs.bb30
-rw-r--r--packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb58
-rw-r--r--packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb57
-rw-r--r--packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb55
-rw-r--r--packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb56
-rw-r--r--packages/linux/husky-kernel-2.4-embedix.bb4
-rw-r--r--packages/linux/ipod_2.4.24-ipod0.bb23
-rw-r--r--packages/linux/ixp4xx-kernel.inc378
-rw-r--r--packages/linux/ixp4xx-kernel/.mtn2git_empty0
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/.mtn2git_empty0
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/00-memory-h-page-shift.patch91
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch70
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/11-mtdpart-redboot-config-byteswap.patch74
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch80
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch3208
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/45-eeprom-notifier.patch184
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/48-setup-byteswap-cmdline.patch48
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/50-nas100d-arch.patch453
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/55-rtc-pcf8563.patch174
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-ixp4xx-beeper.patch238
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-nas100d-i2c.patch531
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-nas100d-ide.patch155
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-nas100d-rtc.patch21
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/65-loft-config.patch84
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/81-nslu2-power.patch12
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/82-nas100d-power.patch12
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch280
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/91-maclist.patch570
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/92-nas100d-maclist.patch72