Stefan Dirsch
d7e8d0e628
* Leak of uninitialized heap memory form the X server to clients
on pixmap allocation (ZDI-CAN-11426, CVE-2020-14347, bsc#1174633)
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=771
24 lines
777 B
Diff
24 lines
777 B
Diff
Avoid leaking un-initalized memory to clients by zeroing the
|
|
whole pixmap on initial allocation.
|
|
|
|
This vulnerability was discovered by:
|
|
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
|
|
|
|
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
|
|
---
|
|
dix/pixmap.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/dix/pixmap.c b/dix/pixmap.c
|
|
index 1186d7dbb..5a0146bbb 100644
|
|
--- a/dix/pixmap.c
|
|
+++ b/dix/pixmap.c
|
|
@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
|
|
if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
|
|
return NullPixmap;
|
|
|
|
- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
|
|
+ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
|
|
if (!pPixmap)
|
|
return NullPixmap;
|