XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

os: Use LOCAL_PEERCRED to determine local client PID on FreeBSD

Browse Source 
LOCAL_PEERCRED is similar to SO_PEERCRED but takes SOL_LOCAL. On DragonFly
cr_pid isn't supported yet, so fall back to getpeereid().

Based on https://gitlab.freedesktop.org/wayland/wayland/-/commit/54b237a61257
This commit is contained in:
Jan Beich
2023-01-27 09:55:33 +00:00
committed by Matt Turner
parent 0dacee6c51
commit 58e8c967b6
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
os/access.c
View File

@@ -116,6 +116,10 @@ SOFTWARE.
#endif
#endif
#ifdef HAVE_SYS_UCRED_H
#include <sys/ucred.h>
#endif
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
@@ -1166,7 +1170,7 @@ ComputeLocalClient(ClientPtr client)
int
GetLocalClientCreds(ClientPtr client, LocalClientCredRec ** lccp)
{
#if defined(HAVE_GETPEEREID) || defined(HAVE_GETPEERUCRED) || defined(SO_PEERCRED)
#if defined(HAVE_GETPEEREID) || defined(HAVE_GETPEERUCRED) || defined(SO_PEERCRED) || defined(LOCAL_PEERCRED)
int fd;
XtransConnInfo ci;
LocalClientCredRec *lcc;
@@ -1177,6 +1181,9 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredRec ** lccp)
#elif defined(SO_PEERCRED)
struct ucred peercred;
socklen_t so_len = sizeof(peercred);
#elif defined(LOCAL_PEERCRED) && defined(HAVE_XUCRED_CR_PID)
struct xucred peercred;
socklen_t so_len = sizeof(peercred);
#elif defined(HAVE_GETPEEREID)
uid_t uid;
gid_t gid;
@@ -1253,6 +1260,17 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredRec ** lccp)
lcc->pid = peercred.pid;
lcc->fieldsSet = LCC_UID_SET | LCC_GID_SET | LCC_PID_SET;
return 0;
#elif defined(LOCAL_PEERCRED) && defined(HAVE_XUCRED_CR_PID)
if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERCRED, &peercred, &so_len) != 0 ||
peercred.cr_version != XUCRED_VERSION) {
FreeLocalClientCreds(lcc);
return -1;
}
lcc->euid = peercred.cr_uid;
lcc->egid = peercred.cr_gid;
lcc->pid = peercred.cr_pid;
lcc->fieldsSet = LCC_UID_SET | LCC_GID_SET | LCC_PID_SET;
return 0;
#elif defined(HAVE_GETPEEREID)
if (getpeereid(fd, &uid, &gid) == -1) {
FreeLocalClientCreds(lcc);