andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xace: add hooks + new access codes: core protocol pixmap requests

Browse Source
This commit is contained in:
Eamon Walsh 2007-08-16 12:27:48 -04:00 committed by Eamon Walsh
parent fe9bc481ef
commit 3ef2e9e623
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dix/dispatch.c
View File

@ -1500,7 +1500,7 @@ ProcCreatePixmap(ClientPtr client)
LEGAL_NEW_RESOURCE(stuff->pid, client); LEGAL_NEW_RESOURCE(stuff->pid, client);
rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY, rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,
DixReadAccess); DixGetAttrAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -1543,9 +1543,17 @@ CreatePmap:
{ {
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = stuff->pid; pMap->drawable.id = stuff->pid;
/* security creation/labeling check */
rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP,
DixCreateAccess, pMap);
if (rc != Success) {
(*pDraw->pScreen->DestroyPixmap)(pMap);
return rc;
}
if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap)) if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
return(client->noClientException); return(client->noClientException);
} }
(*pDraw->pScreen->DestroyPixmap)(pMap);
return (BadAlloc); return (BadAlloc);
} }
@ -1553,13 +1561,13 @@ int
ProcFreePixmap(ClientPtr client) ProcFreePixmap(ClientPtr client)
{ {
PixmapPtr pMap; PixmapPtr pMap;
int rc;
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
pMap = (PixmapPtr)SecurityLookupIDByType(client, stuff->id, RT_PIXMAP,
rc = dixLookupResource((pointer *)&pMap, stuff->id, RT_PIXMAP, client,
DixDestroyAccess); DixDestroyAccess);
if (pMap) if (rc == Success)
{ {
FreeResource(stuff->id, RT_NONE); FreeResource(stuff->id, RT_NONE);
return(client->noClientException); return(client->noClientException);
@ -1567,7 +1575,7 @@ ProcFreePixmap(ClientPtr client)
else else
{ {
client->errorValue = stuff->id; client->errorValue = stuff->id;
return (BadPixmap); return (rc == BadValue) ? BadPixmap : rc;
} }
} }