frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shm: Also censor images returned by ShmGetImage 

We currently censor images from dix's GetImage, but not from
ShmGetImage. This is a method to bypass XACE, creating a potential
leak. We should censor in both methods.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
This commit is contained in:
Andrew Eikum 2016-07-06 14:13:09 -05:00 committed by Adam Jackson
parent 9fcb554e9b
commit 4926845a57
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Xext/shm.c
View File

@ -618,6 +618,7 @@ ProcShmGetImage(ClientPtr client)
xShmGetImageReply xgi; xShmGetImageReply xgi;
ShmDescPtr shmdesc; ShmDescPtr shmdesc;
VisualID visual = None; VisualID visual = None;
RegionPtr pVisibleRegion = NULL;
int rc; int rc;
REQUEST(xShmGetImageReq); REQUEST(xShmGetImageReq);
@ -649,6 +650,9 @@ ProcShmGetImage(ClientPtr client)
wBorderWidth((WindowPtr) pDraw) + (int) pDraw->height) wBorderWidth((WindowPtr) pDraw) + (int) pDraw->height)
return BadMatch; return BadMatch;
visual = wVisual(((WindowPtr) pDraw)); visual = wVisual(((WindowPtr) pDraw));
pVisibleRegion = NotClippedByChildren((WindowPtr) pDraw);
if (pVisibleRegion)
RegionTranslate(pVisibleRegion, -pDraw->x, -pDraw->y);
} }
else { else {
if (stuff->x < 0 || if (stuff->x < 0 ||
@ -685,6 +689,11 @@ ProcShmGetImage(ClientPtr client)
stuff->width, stuff->height, stuff->width, stuff->height,
stuff->format, stuff->planeMask, stuff->format, stuff->planeMask,
shmdesc->addr + stuff->offset); shmdesc->addr + stuff->offset);
if (pVisibleRegion)
XaceCensorImage(client, pVisibleRegion,
PixmapBytePad(stuff->width, pDraw->depth), pDraw,
stuff->x, stuff->y, stuff->width, stuff->height,
stuff->format, shmdesc->addr + stuff->offset);
} }
else { else {
@ -696,11 +705,19 @@ ProcShmGetImage(ClientPtr client)
stuff->width, stuff->height, stuff->width, stuff->height,
stuff->format, plane, stuff->format, plane,
shmdesc->addr + length); shmdesc->addr + length);
if (pVisibleRegion)
XaceCensorImage(client, pVisibleRegion,
BitmapBytePad(stuff->width), pDraw,
stuff->x, stuff->y, stuff->width, stuff->height,
stuff->format, shmdesc->addr + length);
length += lenPer; length += lenPer;
} }
} }
} }
if (pVisibleRegion)
RegionDestroy(pVisibleRegion);
if (client->swapped) { if (client->swapped) {
swaps(&xgi.sequenceNumber); swaps(&xgi.sequenceNumber);
swapl(&xgi.length); swapl(&xgi.length);