diff options
Diffstat (limited to 'dri3/dri3_request.c')
| -rw-r--r-- | dri3/dri3_request.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c index b6128659c..cdb5a1f1e 100644 --- a/dri3/dri3_request.c +++ b/dri3/dri3_request.c @@ -24,6 +24,7 @@ #include <unistd.h> #include "dix/dix_priv.h" +#include "os/client_priv.h" #include "dri3_priv.h" #include <syncsrv.h> @@ -239,7 +240,7 @@ proc_dri3_pixmap_from_buffer(ClientPtr client) pixmap->drawable.id = stuff->pixmap; /* security creation/labeling check */ - rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pixmap, X11_RESTYPE_PIXMAP, + rc = XaceHookResourceAccess(client, stuff->pixmap, X11_RESTYPE_PIXMAP, pixmap, X11_RESTYPE_NONE, NULL, DixCreateAccess); if (rc != Success) { @@ -503,7 +504,7 @@ proc_dri3_pixmap_from_buffers(ClientPtr client) pixmap->drawable.id = stuff->pixmap; /* security creation/labeling check */ - rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pixmap, X11_RESTYPE_PIXMAP, + rc = XaceHookResourceAccess(client, stuff->pixmap, X11_RESTYPE_PIXMAP, pixmap, X11_RESTYPE_NONE, NULL, DixCreateAccess); if (rc != Success) { @@ -676,8 +677,6 @@ sproc_dri3_query_version(ClientPtr client) { REQUEST(xDRI3QueryVersionReq); REQUEST_SIZE_MATCH(xDRI3QueryVersionReq); - - swaps(&stuff->length); swapl(&stuff->majorVersion); swapl(&stuff->minorVersion); return (*proc_dri3_vector[stuff->dri3ReqType]) (client); @@ -688,8 +687,6 @@ sproc_dri3_open(ClientPtr client) { REQUEST(xDRI3OpenReq); REQUEST_SIZE_MATCH(xDRI3OpenReq); - - swaps(&stuff->length); swapl(&stuff->drawable); swapl(&stuff->provider); return (*proc_dri3_vector[stuff->dri3ReqType]) (client); @@ -700,8 +697,6 @@ sproc_dri3_pixmap_from_buffer(ClientPtr client) { REQUEST(xDRI3PixmapFromBufferReq); REQUEST_SIZE_MATCH(xDRI3PixmapFromBufferReq); - - swaps(&stuff->length); swapl(&stuff->pixmap); swapl(&stuff->drawable); swapl(&stuff->size); @@ -716,8 +711,6 @@ sproc_dri3_buffer_from_pixmap(ClientPtr client) { REQUEST(xDRI3BufferFromPixmapReq); REQUEST_SIZE_MATCH(xDRI3BufferFromPixmapReq); - - swaps(&stuff->length); swapl(&stuff->pixmap); return (*proc_dri3_vector[stuff->dri3ReqType]) (client); } @@ -727,8 +720,6 @@ sproc_dri3_fence_from_fd(ClientPtr client) { REQUEST(xDRI3FenceFromFDReq); REQUEST_SIZE_MATCH(xDRI3FenceFromFDReq); - - swaps(&stuff->length); swapl(&stuff->drawable); swapl(&stuff->fence); return (*proc_dri3_vector[stuff->dri3ReqType]) (client); @@ -739,8 +730,6 @@ sproc_dri3_fd_from_fence(ClientPtr client) { REQUEST(xDRI3FDFromFenceReq); REQUEST_SIZE_MATCH(xDRI3FDFromFenceReq); - - swaps(&stuff->length); swapl(&stuff->drawable); swapl(&stuff->fence); return (*proc_dri3_vector[stuff->dri3ReqType]) (client); @@ -751,8 +740,6 @@ sproc_dri3_get_supported_modifiers(ClientPtr client) { REQUEST(xDRI3GetSupportedModifiersReq); REQUEST_SIZE_MATCH(xDRI3GetSupportedModifiersReq); - - swaps(&stuff->length); swapl(&stuff->window); return (*proc_dri3_vector[stuff->dri3ReqType]) (client); } @@ -762,8 +749,6 @@ sproc_dri3_pixmap_from_buffers(ClientPtr client) { REQUEST(xDRI3PixmapFromBuffersReq); REQUEST_SIZE_MATCH(xDRI3PixmapFromBuffersReq); - - swaps(&stuff->length); swapl(&stuff->pixmap); swapl(&stuff->window); swaps(&stuff->width); @@ -785,8 +770,6 @@ sproc_dri3_buffers_from_pixmap(ClientPtr client) { REQUEST(xDRI3BuffersFromPixmapReq); REQUEST_SIZE_MATCH(xDRI3BuffersFromPixmapReq); - - swaps(&stuff->length); swapl(&stuff->pixmap); return (*proc_dri3_vector[stuff->dri3ReqType]) (client); } @@ -807,8 +790,6 @@ sproc_dri3_import_syncobj(ClientPtr client) { REQUEST(xDRI3ImportSyncobjReq); REQUEST_SIZE_MATCH(xDRI3ImportSyncobjReq); - - swaps(&stuff->length); swapl(&stuff->syncobj); swapl(&stuff->drawable); return (*proc_dri3_vector[stuff->dri3ReqType]) (client); @@ -819,8 +800,6 @@ sproc_dri3_free_syncobj(ClientPtr client) { REQUEST(xDRI3FreeSyncobjReq); REQUEST_SIZE_MATCH(xDRI3FreeSyncobjReq); - - swaps(&stuff->length); swapl(&stuff->syncobj); return (*proc_dri3_vector[stuff->dri3ReqType]) (client); } |