rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

avoid unterminated haystack

Browse Source
This commit is contained in:
Adam Jackson 2007-12-10 20:34:09 +00:00
parent 4edb4ea636
commit 73fc9241cd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xserver-1.4.99-ssh-isnt-local.patch
View File

@ -11,7 +11,7 @@ diff --git a/Xext/shm.c b/Xext/shm.c
index 5937a03..5376c19 100644 index 5937a03..5376c19 100644
--- a/Xext/shm.c --- a/Xext/shm.c
+++ b/Xext/shm.c +++ b/Xext/shm.c
@@ -381,8 +381,20 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly) @@ -381,8 +381,21 @@
mode_t mask; mode_t mask;
int uidset = 0, gidset = 0; int uidset = 0, gidset = 0;
LocalClientCredRec *lcc; LocalClientCredRec *lcc;
@ -23,8 +23,9 @@ index 5937a03..5376c19 100644
+ /* ssh isn't actually a local client */ + /* ssh isn't actually a local client */
+ char exe[64], buf[64]; + char exe[64], buf[64];
+ +
+ memset(buf, 0, 64);
+ snprintf(exe, 64, "/proc/%d/exe", lcc->pid); + snprintf(exe, 64, "/proc/%d/exe", lcc->pid);
+ readlink(exe, buf, 64); + readlink(exe, buf, 63);
+ if (strstr(buf, "/ssh")) + if (strstr(buf, "/ssh"))
+ is_ssh = TRUE; + is_ssh = TRUE;
+ } + }
@ -32,7 +33,7 @@ index 5937a03..5376c19 100644
if (lcc->fieldsSet & LCC_UID_SET) { if (lcc->fieldsSet & LCC_UID_SET) {
uid = lcc->euid; uid = lcc->euid;
@@ -401,6 +413,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly) @@ -401,6 +414,9 @@
} }
#endif #endif
FreeLocalClientCreds(lcc); FreeLocalClientCreds(lcc);