mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
Jackie Huang
e99089ce24
Backport 3 patches to fix CVE-2017-10971: In the X.Org X server before 2017-06-19, a user authenticated to an X Session could crash or execute code in the context of the X Server by exploiting a stack overflow in the endianness conversion of X Events. Reference: https://nvd.nist.gov/vuln/detail/CVE-2017-10971 (From OE-Core rev: 20428f660f2c046c63bbf63c4e4af95dac9f2b3d) (From OE-Core rev: 8c42a9508bded870d1ac018e2cfa129772983c52) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001
|
|
From: Michal Srb <msrb@suse.com>
|
|
Date: Wed, 24 May 2017 15:54:41 +0300
|
|
Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent.
|
|
|
|
The requirement is that events have type in range
|
|
EXTENSION_EVENT_BASE..lastEvent, but it was tested
|
|
only for first event of all.
|
|
|
|
Signed-off-by: Michal Srb <msrb@suse.com>
|
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
|
CVE: CVE-2017-10971
|
|
|
|
Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/xserver/commit/?id=8caed4df36b1f802b4992edcfd282cbeeec35d9d]
|
|
|
|
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|
---
|
|
Xi/sendexev.c | 12 +++++++-----
|
|
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
|
|
index 1cf118a..5e63bfc 100644
|
|
--- a/Xi/sendexev.c
|
|
+++ b/Xi/sendexev.c
|
|
@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client)
|
|
int
|
|
ProcXSendExtensionEvent(ClientPtr client)
|
|
{
|
|
- int ret;
|
|
+ int ret, i;
|
|
DeviceIntPtr dev;
|
|
xEvent *first;
|
|
XEventClass *list;
|
|
@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client)
|
|
/* The client's event type must be one defined by an extension. */
|
|
|
|
first = ((xEvent *) &stuff[1]);
|
|
- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) &&
|
|
- (first->u.u.type < lastEvent))) {
|
|
- client->errorValue = first->u.u.type;
|
|
- return BadValue;
|
|
+ for (i = 0; i < stuff->num_events; i++) {
|
|
+ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) &&
|
|
+ (first[i].u.u.type < lastEvent))) {
|
|
+ client->errorValue = first[i].u.u.type;
|
|
+ return BadValue;
|
|
+ }
|
|
}
|
|
|
|
list = (XEventClass *) (first + stuff->num_events);
|
|
--
|
|
1.7.9.5
|
|
|