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

Xnamespace: whitelist access to namespace virtual root window 

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 fdba5d405d
commit 7afdba1952
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,19 @@ void hookResourceAccess(CallbackListPtr *pcbl, void *unused, void *calldata)
if (param->rtype == X11_RESTYPE_WINDOW) { if (param->rtype == X11_RESTYPE_WINDOW) {
WindowPtr pWindow = (WindowPtr) param->res; WindowPtr pWindow = (WindowPtr) param->res;
/* white-listed operations on namespace's virtual root window */
if (pWindow == subj->ns->rootWindow) {
switch (client->majorOp) {
case X_DeleteProperty:
case X_ChangeProperty:
case X_GetProperty:
case X_RotateProperties:
case X_QueryTree:
goto pass;
}
XNS_HOOK_LOG("unhandled access to NS' virtual root window 0x%0x\n", pWindow->drawable.id);
}
/* white-listed operations on actual root window */ /* white-listed operations on actual root window */
if (pWindow && (pWindow == pWindow->drawable.pScreen->root)) { if (pWindow && (pWindow == pWindow->drawable.pScreen->root)) {
switch (client->majorOp) { switch (client->majorOp) {

5
Xext/namespace/hook-windowproperty.c
View File

@ -40,8 +40,13 @@ void hookWindowProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
if (XnsClientSameNS(subj, obj)) if (XnsClientSameNS(subj, obj))
return; return;
// allow access to namespace virtual root
if (param->window == subj->ns->rootWindow->drawable.id)
return;
// redirect root window access to namespace's virtual root // redirect root window access to namespace's virtual root
if (dixWindowIsRoot(param->window)) { if (dixWindowIsRoot(param->window)) {
param->window = subj->ns->rootWindow->drawable.id; param->window = subj->ns->rootWindow->drawable.id;
return;
} }
} }