diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-09-05 11:18:36 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-09-05 11:18:36 -0400 |
| commit | 0003ccfcdfae1b473aa024342304b84256d378b9 (patch) | |
| tree | 17e716298c24649d85a2ab9bd0a7826f7cc3005a /render | |
| parent | ce9e83d913511fe619da42f805d7bcd1a2a60d90 (diff) | |
xace: add new fields to resource access hook to allow parent resource objects
to be passed in at create time. Also added a missing devPrivates initializer.
Diffstat (limited to 'render')
| -rw-r--r-- | render/animcur.c | 6 | ||||
| -rw-r--r-- | render/picture.c | 4 | ||||
| -rw-r--r-- | render/render.c | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/render/animcur.c b/render/animcur.c index da3d4a02d..125928931 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -377,12 +377,12 @@ AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *pp pCursor->backGreen = cursors[0]->backGreen; pCursor->backBlue = cursors[0]->backBlue; - pCursor->devPrivates = NULL; pCursor->id = cid; + pCursor->devPrivates = NULL; /* security creation/labeling check */ - rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR, - DixCreateAccess, pCursor); + rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR, pCursor, + RT_NONE, NULL, DixCreateAccess); if (rc != Success) { dixFreePrivates(pCursor->devPrivates); xfree(pCursor); diff --git a/render/picture.c b/render/picture.c index 7b200ee41..660ef12ad 100644 --- a/render/picture.c +++ b/render/picture.c @@ -727,8 +727,8 @@ CreatePicture (Picture pid, pPicture->devPrivates = NULL; /* security creation/labeling check */ - *error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType, - DixCreateAccess|DixSetAttrAccess, pPicture); + *error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType, pPicture, + RC_DRAWABLE, pDrawable, DixCreateAccess|DixSetAttrAccess); if (*error != Success) goto out; diff --git a/render/render.c b/render/render.c index 37d2d620e..40d5add05 100644 --- a/render/render.c +++ b/render/render.c @@ -1025,7 +1025,7 @@ ProcRenderCreateGlyphSet (ClientPtr client) return BadAlloc; /* security creation/labeling check */ rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->gsid, GlyphSetType, - DixCreateAccess, glyphSet); + glyphSet, RT_NONE, NULL, DixCreateAccess); if (rc != Success) return rc; if (!AddResource (stuff->gsid, GlyphSetType, (pointer)glyphSet)) @@ -1903,7 +1903,7 @@ static int ProcRenderCreateSolidFill(ClientPtr client) return error; /* security creation/labeling check */ error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType, - DixCreateAccess, pPicture); + pPicture, RT_NONE, NULL, DixCreateAccess); if (error != Success) return error; if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) @@ -1937,7 +1937,7 @@ static int ProcRenderCreateLinearGradient (ClientPtr client) return error; /* security creation/labeling check */ error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType, - DixCreateAccess, pPicture); + pPicture, RT_NONE, NULL, DixCreateAccess); if (error != Success) return error; if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) @@ -1972,7 +1972,7 @@ static int ProcRenderCreateRadialGradient (ClientPtr client) return error; /* security creation/labeling check */ error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType, - DixCreateAccess, pPicture); + pPicture, RT_NONE, NULL, DixCreateAccess); if (error != Success) return error; if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) @@ -2006,7 +2006,7 @@ static int ProcRenderCreateConicalGradient (ClientPtr client) return error; /* security creation/labeling check */ error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType, - DixCreateAccess, pPicture); + pPicture, RT_NONE, NULL, DixCreateAccess); if (error != Success) return error; if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) |