Module Name: xsrc
Committed By: christos
Date: Fri Oct 7 15:55:36 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
drmmode_display.c
Log Message:
CID 1373518: Memory corruption (off-by-one)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c:1.2 Fri Oct 7 11:43:38 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c Fri Oct 7 11:55:36 2016
@@ -1370,7 +1370,7 @@ static int parse_path_blob(drmModeProper
if (!conn)
return -1;
len = conn - (blob_data + 4);
- if (len + 1> 5)
+ if (len + 1 >= sizeof(conn_id))
return -1;
memcpy(conn_id, blob_data + 4, len);
conn_id[len + 1] = '\0';
