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

dix: add dixClientForXID() 

Retrieves the ClientPtr for the owner of given resource.
This way reducing the sites directly accessing clients[] array.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-03-05 15:05:56 +01:00
parent ed7f0bb0aa
commit a09805f675
12 changed files with 73 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/panoramiX.c
View File

@ -353,7 +353,7 @@ PanoramiXFindIDByScrnum(RESTYPE type, XID id, int screen)
data.screen = screen; data.screen = screen;
data.id = id; data.id = id;
return LookupClientResourceComplex(clients[dixClientIdForXID(id)], type, return LookupClientResourceComplex(dixClientForXID(id), type,
XineramaFindIDByScrnum, &data); XineramaFindIDByScrnum, &data);
} }

19
Xext/security.c
View File

@ -743,7 +743,6 @@ SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XaceResourceAccessRec *rec = calldata; XaceResourceAccessRec *rec = calldata;
SecurityStateRec *subj, *obj; SecurityStateRec *subj, *obj;
int cid = dixClientIdForXID(rec->id);
Mask requested = rec->access_mode; Mask requested = rec->access_mode;
Mask allowed = SecurityResourceMask; Mask allowed = SecurityResourceMask;
@ -758,8 +757,12 @@ SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata)
if (rec->rtype == X11_RESTYPE_WINDOW) if (rec->rtype == X11_RESTYPE_WINDOW)
allowed |= SecurityWindowExtraMask; allowed |= SecurityWindowExtraMask;
ClientPtr owner = dixClientForXID(rec->id);
if (!owner)
goto denied;
/* special checks for server-owned resources */ /* special checks for server-owned resources */
if (cid == 0) { if (owner == serverClient) {
if (rec->rtype & RC_DRAWABLE) if (rec->rtype & RC_DRAWABLE)
/* additional operations allowed on root windows */ /* additional operations allowed on root windows */
allowed |= SecurityRootWindowExtraMask; allowed |= SecurityRootWindowExtraMask;
@ -773,15 +776,15 @@ SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata)
allowed |= DixReadAccess; allowed |= DixReadAccess;
} }
if (clients[cid] != NULL) { obj = dixLookupPrivate(&owner->devPrivates, stateKey);
obj = dixLookupPrivate(&clients[cid]->devPrivates, stateKey); if (SecurityDoCheck(subj, obj, requested, allowed) == Success)
if (SecurityDoCheck(subj, obj, requested, allowed) == Success) return;
return;
}
denied:
SecurityAudit("Security: denied client %d access %lx to resource 0x%lx " SecurityAudit("Security: denied client %d access %lx to resource 0x%lx "
"of client %d on request %s\n", rec->client->index, "of client %d on request %s\n", rec->client->index,
(unsigned long)requested, (unsigned long)rec->id, cid, (unsigned long)requested, (unsigned long)rec->id,
dixClientIdForXID(rec->id),
SecurityLookupRequestName(rec->client)); SecurityLookupRequestName(rec->client));
rec->status = BadAccess; /* deny access */ rec->status = BadAccess; /* deny access */
} }

54
Xext/xres.c
View File

@ -307,10 +307,10 @@ ProcXResQueryClientResources(ClientPtr client)
REQUEST_SIZE_MATCH(xXResQueryClientResourcesReq); REQUEST_SIZE_MATCH(xXResQueryClientResourcesReq);
int clientID = dixClientIdForXID(stuff->xid); ClientPtr resClient = dixClientForXID(stuff->xid);
if ((clientID >= currentMaxClients) || !clients[clientID] || if ((!resClient) ||
(XaceHookClientAccess(client, clients[clientID], DixReadAccess) (XaceHookClientAccess(client, resClient, DixReadAccess)
!= Success)) { != Success)) {
client->errorValue = stuff->xid; client->errorValue = stuff->xid;
return BadValue; return BadValue;
@ -318,7 +318,7 @@ ProcXResQueryClientResources(ClientPtr client)
counts = calloc(lastResourceType + 1, sizeof(int)); counts = calloc(lastResourceType + 1, sizeof(int));
FindAllClientResources(clients[clientID], ResFindAllRes, counts); FindAllClientResources(resClient, ResFindAllRes, counts);
num_types = 0; num_types = 0;
@ -380,22 +380,19 @@ ProcXResQueryClientPixmapBytes(ClientPtr client)
{ {
REQUEST(xXResQueryClientPixmapBytesReq); REQUEST(xXResQueryClientPixmapBytesReq);
xXResQueryClientPixmapBytesReply rep; xXResQueryClientPixmapBytesReply rep;
unsigned long bytes;
REQUEST_SIZE_MATCH(xXResQueryClientPixmapBytesReq); REQUEST_SIZE_MATCH(xXResQueryClientPixmapBytesReq);
int clientID = dixClientIdForXID(stuff->xid); ClientPtr owner = dixClientForXID(stuff->xid);
if ((!owner) ||
if ((clientID >= currentMaxClients) || !clients[clientID] || (XaceHookClientAccess(client, owner, DixReadAccess)
(XaceHookClientAccess(client, clients[clientID], DixReadAccess)
!= Success)) { != Success)) {
client->errorValue = stuff->xid; client->errorValue = stuff->xid;
return BadValue; return BadValue;
} }
bytes = 0; unsigned long bytes = 0;
FindAllClientResources(owner, ResFindResourcePixmaps,
FindAllClientResources(clients[clientID], ResFindResourcePixmaps,
(void *) (&bytes)); (void *) (&bytes));
rep = (xXResQueryClientPixmapBytesReply) { rep = (xXResQueryClientPixmapBytesReply) {
@ -555,12 +552,11 @@ ConstructClientIds(ClientPtr client,
} }
} }
} else { } else {
int clientID = dixClientIdForXID(specs[specIdx].client); ClientPtr owner = dixClientForXID(specs[specIdx].client);
if (owner &&
if ((clientID < currentMaxClients) && clients[clientID] && (XaceHookClientAccess(client, owner, DixReadAccess)
(XaceHookClientAccess(client, clients[clientID], DixReadAccess)
!= Success)) { != Success)) {
if (!ConstructClientIdValue(client, clients[clientID], if (!ConstructClientIdValue(client, owner,
specs[specIdx].mask, ctx)) { specs[specIdx].mask, ctx)) {
return BadAlloc; return BadAlloc;
} }
@ -897,16 +893,12 @@ ConstructResourceBytesByResource(XID aboutClient, ConstructResourceBytesCtx *ctx
for (specIdx = 0; specIdx < ctx->numSpecs; ++specIdx) { for (specIdx = 0; specIdx < ctx->numSpecs; ++specIdx) {
xXResResourceIdSpec *spec = ctx->specs + specIdx; xXResResourceIdSpec *spec = ctx->specs + specIdx;
if (spec->resource) { if (spec->resource) {
int cid = dixClientIdForXID(spec->resource); ClientPtr client = dixClientForXID(spec->resource);
if (cid < currentMaxClients && if (client && (aboutClient == None || aboutClient == client->index)) {
(aboutClient == None || cid == aboutClient)) { ctx->curSpec = spec;
ClientPtr client = clients[cid]; FindAllClientResources(client,
if (client) { AddResourceSizeValueByResource,
ctx->curSpec = spec; ctx);
FindAllClientResources(client,
AddResourceSizeValueByResource,
ctx);
}
} }
} }
} }
@ -925,16 +917,12 @@ ConstructResourceBytes(XID aboutClient,
ConstructResourceBytesCtx *ctx) ConstructResourceBytesCtx *ctx)
{ {
if (aboutClient) { if (aboutClient) {
int clientIdx = dixClientIdForXID(aboutClient); ClientPtr client = dixClientForXID(aboutClient);
ClientPtr client = NullClient; if (!client) {
if ((clientIdx >= currentMaxClients) || !clients[clientIdx]) {
ctx->sendClient->errorValue = aboutClient; ctx->sendClient->errorValue = aboutClient;
return BadValue; return BadValue;
} }
client = clients[clientIdx];
ConstructClientResourceBytes(client, ctx); ConstructClientResourceBytes(client, ctx);
ConstructResourceBytesByResource(aboutClient, ctx); ConstructResourceBytesByResource(aboutClient, ctx);
} else { } else {

5
Xext/xselinux_hooks.c
View File

@ -632,7 +632,10 @@ SELinuxResource(CallbackListPtr *pcbl, void *unused, void *calldata)
if (offset < 0) { if (offset < 0) {
/* No: use the SID of the owning client */ /* No: use the SID of the owning client */
class = SECCLASS_X_RESOURCE; class = SECCLASS_X_RESOURCE;
privatePtr = &clients[dixClientIdForXID(rec->id)]->devPrivates; ClientPtr owner = dixClientForXID(rec->id);
if (!owner)
return;
privatePtr = &owner->devPrivates;
obj = dixLookupPrivate(privatePtr, objectKey); obj = dixLookupPrivate(privatePtr, objectKey);
} }
else { else {

8
composite/compalloc.c
View File

@ -431,7 +431,7 @@ compFreeClientSubwindows(WindowPtr pWin, XID id)
return; return;
for (prev = &csw->clients; (ccw = *prev); prev = &ccw->next) { for (prev = &csw->clients; (ccw = *prev); prev = &ccw->next) {
if (ccw->id == id) { if (ccw->id == id) {
ClientPtr pClient = clients[dixClientIdForXID(id)]; ClientPtr pClient = dixClientForXID(id);
*prev = ccw->next; *prev = ccw->next;
if (ccw->update == CompositeRedirectManual) { if (ccw->update == CompositeRedirectManual) {
@ -500,9 +500,8 @@ compRedirectOneSubwindow(WindowPtr pParent, WindowPtr pWin)
if (!csw) if (!csw)
return Success; return Success;
for (ccw = csw->clients; ccw; ccw = ccw->next) { for (ccw = csw->clients; ccw; ccw = ccw->next) {
int ret = compRedirectWindow(clients[dixClientIdForXID(ccw->id)], int ret = compRedirectWindow(dixClientForXID(ccw->id),
pWin, ccw->update); pWin, ccw->update);
if (ret != Success) if (ret != Success)
return ret; return ret;
} }
@ -522,9 +521,8 @@ compUnredirectOneSubwindow(WindowPtr pParent, WindowPtr pWin)
if (!csw) if (!csw)
return Success; return Success;
for (ccw = csw->clients; ccw; ccw = ccw->next) { for (ccw = csw->clients; ccw; ccw = ccw->next) {
int ret = compUnredirectWindow(clients[dixClientIdForXID(ccw->id)], int ret = compUnredirectWindow(dixClientForXID(ccw->id),
pWin, ccw->update); pWin, ccw->update);
if (ret != Success) if (ret != Success)
return ret; return ret;
} }

2
composite/compwindow.c
View File

@ -575,7 +575,7 @@ compCreateWindow(WindowPtr pWin)
(*pScreen->SetWindowPixmap) (pWin, parent_pixmap); (*pScreen->SetWindowPixmap) (pWin, parent_pixmap);
if (csw) if (csw)
for (ccw = csw->clients; ccw; ccw = ccw->next) for (ccw = csw->clients; ccw; ccw = ccw->next)
compRedirectWindow(clients[dixClientIdForXID(ccw->id)], compRedirectWindow(dixClientForXID(ccw->id),
pWin, ccw->update); pWin, ccw->update);
if (compImplicitRedirect(pWin, pWin->parent)) if (compImplicitRedirect(pWin, pWin->parent))
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic); compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);

6
dix/grabs.c
View File

@ -77,7 +77,6 @@ SOFTWARE.
void void
PrintDeviceGrabInfo(DeviceIntPtr dev) PrintDeviceGrabInfo(DeviceIntPtr dev)
{ {
ClientPtr client;
LocalClientCredRec *lcc; LocalClientCredRec *lcc;
int i, j; int i, j;
GrabInfoPtr devGrab = &dev->deviceGrab; GrabInfoPtr devGrab = &dev->deviceGrab;
@ -89,7 +88,7 @@ PrintDeviceGrabInfo(DeviceIntPtr dev)
(grab->grabtype == XI2) ? "xi2" : (grab->grabtype == XI2) ? "xi2" :
((grab->grabtype == CORE) ? "core" : "xi1"), dev->name, dev->id); ((grab->grabtype == CORE) ? "core" : "xi1"), dev->name, dev->id);
client = clients[dixClientIdForXID(grab->resource)]; ClientPtr client = dixClientForXID(grab->resource);
if (client) { if (client) {
pid_t clientpid = GetClientPid(client); pid_t clientpid = GetClientPid(client);
const char *cmdname = GetClientCmdName(client); const char *cmdname = GetClientCmdName(client);
@ -173,7 +172,6 @@ void
UngrabAllDevices(Bool kill_client) UngrabAllDevices(Bool kill_client)
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
ClientPtr client;
ErrorF("Ungrabbing all devices%s; grabs listed below:\n", ErrorF("Ungrabbing all devices%s; grabs listed below:\n",
kill_client ? " and killing their owners" : ""); kill_client ? " and killing their owners" : "");
@ -182,7 +180,7 @@ UngrabAllDevices(Bool kill_client)
if (!dev->deviceGrab.grab) if (!dev->deviceGrab.grab)
continue; continue;
PrintDeviceGrabInfo(dev); PrintDeviceGrabInfo(dev);
client = clients[dixClientIdForXID(dev->deviceGrab.grab->resource)]; ClientPtr client = dixClientForXID(dev->deviceGrab.grab->resource);
if (!kill_client || !client || client->clientGone) if (!kill_client || !client || client->clientGone)
dev->deviceGrab.DeactivateGrab(dev); dev->deviceGrab.DeactivateGrab(dev);
if (kill_client) if (kill_client)

8
dix/lookup.c
View File

@ -16,26 +16,26 @@ ClientPtr dixClientForWindow(WindowPtr pWin) {
if (!pWin) if (!pWin)
return NullClient; return NullClient;
return clients[dixClientIdForXID(pWin->drawable.id)]; return dixClientForXID(pWin->drawable.id);
} }
ClientPtr dixClientForGrab(GrabPtr pGrab) { ClientPtr dixClientForGrab(GrabPtr pGrab) {
if (!pGrab) if (!pGrab)
return NullClient; return NullClient;
return clients[dixClientIdForXID(pGrab->resource)]; return dixClientForXID(pGrab->resource);
} }
ClientPtr dixClientForInputClients(InputClientsPtr pInputClients) { ClientPtr dixClientForInputClients(InputClientsPtr pInputClients) {
if (!pInputClients) if (!pInputClients)
return NullClient; return NullClient;
return clients[dixClientIdForXID(pInputClients->resource)]; return dixClientForXID(pInputClients->resource);
} }
ClientPtr dixClientForOtherClients(OtherClientsPtr pOtherClients) { ClientPtr dixClientForOtherClients(OtherClientsPtr pOtherClients) {
if (!pOtherClients) if (!pOtherClients)
return NullClient; return NullClient;
return clients[dixClientIdForXID(pOtherClients->resource)]; return dixClientForXID(pOtherClients->resource);
} }

16
dix/resource_priv.h
View File

@ -66,4 +66,20 @@ static inline int dixClientIdForXID(XID xid) {
return ((int)(CLIENT_BITS(xid) >> CLIENTOFFSET)); return ((int)(CLIENT_BITS(xid) >> CLIENTOFFSET));
} }
/*
* @brief retrieve client pointer from XID
*
* XIDs carry the ID of the client who created/owns the resource in upper bits.
* (every client so is assigned a range of XIDs it may use for resource creation)
*
* @param XID the ID of the resource whose client is retrieved
* @return pointer to ClientRec structure or NullClient (NULL)
*/
static inline ClientPtr dixClientForXID(XID xid) {
const int idx = dixClientIdForXID(xid);
if (idx < MAXCLIENTS)
return clients[idx];
return NullClient;
}
#endif /* _XSERVER_DIX_RESOURCE_PRIV_H */ #endif /* _XSERVER_DIX_RESOURCE_PRIV_H */

4
glx/glxcmds.c
View File

@ -2505,7 +2505,9 @@ void
__glXsendSwapEvent(__GLXdrawable *drawable, int type, CARD64 ust, __glXsendSwapEvent(__GLXdrawable *drawable, int type, CARD64 ust,
CARD64 msc, CARD32 sbc) CARD64 msc, CARD32 sbc)
{ {
ClientPtr client = clients[dixClientIdForXID(drawable->drawId)]; ClientPtr client = dixClientForXID(drawable->drawId);
if (!client)
return;
xGLXBufferSwapComplete2 wire = { xGLXBufferSwapComplete2 wire = {
.type = __glXEventBase + GLX_BufferSwapComplete .type = __glXEventBase + GLX_BufferSwapComplete

2
hw/xwayland/xwayland-pixmap.h
View File

@ -50,7 +50,7 @@ Bool xwl_pixmap_init(void);
static inline Bool static inline Bool
xwl_is_client_pixmap(PixmapPtr pixmap) xwl_is_client_pixmap(PixmapPtr pixmap)
{ {
return clients[dixClientIdForXID(pixmap->drawable.id)] != serverClient; return dixClientForXID(pixmap->drawable.id) != serverClient;
} }
#endif /* XWAYLAND_PIXMAP_H */ #endif /* XWAYLAND_PIXMAP_H */

13
record/record.c
View File

@ -866,7 +866,7 @@ RecordInstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
if (pRCAP->pRequestMajorOpSet) { if (pRCAP->pRequestMajorOpSet) {
RecordSetIteratePtr pIter = NULL; RecordSetIteratePtr pIter = NULL;
RecordSetInterval interval; RecordSetInterval interval;
ClientPtr pClient = clients[dixClientIdForXID(client)]; ClientPtr pClient = dixClientForXID(client);
if (pClient && !RecordClientPrivate(pClient)) { if (pClient && !RecordClientPrivate(pClient)) {
RecordClientPrivatePtr pClientPriv; RecordClientPrivatePtr pClientPriv;
@ -949,7 +949,7 @@ RecordUninstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
while (client) { while (client) {
if (client != XRecordFutureClients) { if (client != XRecordFutureClients) {
if (pRCAP->pRequestMajorOpSet) { if (pRCAP->pRequestMajorOpSet) {
ClientPtr pClient = clients[dixClientIdForXID(client)]; ClientPtr pClient = dixClientForXID(client);
int c; int c;
Bool otherRCAPwantsProcVector = FALSE; Bool otherRCAPwantsProcVector = FALSE;
RecordClientPrivatePtr pClientPriv = NULL; RecordClientPrivatePtr pClientPriv = NULL;
@ -1143,7 +1143,6 @@ RecordSanityCheckClientSpecifiers(ClientPtr client, XID *clientspecs,
int nspecs, XID errorspec) int nspecs, XID errorspec)
{ {
int i; int i;
int clientIndex;
int rc; int rc;
void *value; void *value;
@ -1154,10 +1153,10 @@ RecordSanityCheckClientSpecifiers(ClientPtr client, XID *clientspecs,
continue; continue;
if (errorspec && (CLIENT_BITS(clientspecs[i]) == errorspec)) if (errorspec && (CLIENT_BITS(clientspecs[i]) == errorspec))
return BadMatch; return BadMatch;
clientIndex = dixClientIdForXID(clientspecs[i]); ClientPtr pClient = dixClientForXID(clientspecs[i]);
if (clientIndex && clients[clientIndex] && if (pClient && pClient->index != 0 &&
clients[clientIndex]->clientState == ClientStateRunning) { pClient->clientState == ClientStateRunning) {
if (clientspecs[i] == clients[clientIndex]->clientAsMask) if (clientspecs[i] == pClient->clientAsMask)
continue; continue;
rc = dixLookupResourceByClass(&value, clientspecs[i], RC_ANY, rc = dixLookupResourceByClass(&value, clientspecs[i], RC_ANY,
client, DixGetAttrAccess); client, DixGetAttrAccess);