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

Xnamespace: whitelist resource access within same namespace 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-03-21 19:20:45 +01:00
parent 140105dcf0
commit d9d47ec8a1
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Xext/namespace/hook-resource.c
View File

@ -3,6 +3,7 @@
#include <dix-config.h> #include <dix-config.h>
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/window_priv.h"
#include "Xext/xacestr.h" #include "Xext/xacestr.h"
#include "namespace.h" #include "namespace.h"
@ -11,6 +12,8 @@
void hookResourceAccess(CallbackListPtr *pcbl, void *unused, void *calldata) void hookResourceAccess(CallbackListPtr *pcbl, void *unused, void *calldata)
{ {
XNS_HOOK_HEAD(XaceResourceAccessRec); XNS_HOOK_HEAD(XaceResourceAccessRec);
ClientPtr owner = dixLookupXIDOwner(param->id);
struct XnamespaceClientPriv *obj = XnsClientPriv(owner);
// special filtering for windows: block transparency for untrusted clients // special filtering for windows: block transparency for untrusted clients
if (param->rtype == X11_RESTYPE_WINDOW) { if (param->rtype == X11_RESTYPE_WINDOW) {
@ -18,11 +21,28 @@ void hookResourceAccess(CallbackListPtr *pcbl, void *unused, void *calldata)
if (param->access_mode & DixCreateAccess) { if (param->access_mode & DixCreateAccess) {
if (!subj->ns->allowTransparency) { if (!subj->ns->allowTransparency) {
pWindow->forcedBG = TRUE; pWindow->forcedBG = TRUE;
goto pass;
} }
} }
} }
// resource access inside same container is always permitted
if (XnsClientSameNS(subj, obj))
goto pass;
char accModeStr[128];
LookupDixAccessName(param->access_mode, (char*)&accModeStr, sizeof(accModeStr));
XNS_HOOK_LOG("BLOCKED access 0x%07lx %s to %s 0x%06lx of client %d @ %s\n",
(unsigned long)param->access_mode,
accModeStr,
LookupResourceName(param->rtype),
(unsigned long)param->id,
owner->index, // resource owner
obj->ns->name);
param->status = BadAccess;
return;
pass: pass:
// request is passed as it is (or already had been rewritten) // request is passed as it is (or already had been rewritten)
param->status = Success; param->status = Success;