Attachment 24745 Details for Bug 14202 – third try at auth patch

[patch] third try at auth patch

0001-took-third-try-at-xdm-auth-patch.patch (text/plain), 2.54 KB, created by Bart Massey on 2009-04-13 00:05:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bart Massey

Created: 2009-04-13 00:05:19 UTC

Size: 2.54 KB

patch

obsolete

>From f9246713a88b8194a735ee73eccb3ec3c672beb5 Mon Sep 17 00:00:00 2001
>From: Bart Massey <bart@cs.pdx.edu>
>Date: Sun, 12 Apr 2009 23:46:57 -0700
>Subject: [PATCH] took third try at xdm auth patch
>
>---
> src/xcb_auth.c |   38 ++++++++++++++++++++++++++++----------
> 1 files changed, 28 insertions(+), 10 deletions(-)
>
>diff --git a/src/xcb_auth.c b/src/xcb_auth.c
>index 93a6f68..83fe3c4 100644
>--- a/src/xcb_auth.c
>+++ b/src/xcb_auth.c
>@@ -239,17 +239,21 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display)
>     char sockbuf[sizeof(struct sockaddr) + MAXPATHLEN];
>     unsigned int socknamelen = sizeof(sockbuf);   /* need extra space */
>     struct sockaddr *sockname = (struct sockaddr *) &sockbuf;
>+    int gotsockname = 0;
>     Xauth *authptr = 0;
>     int ret = 1;
> 
>+    /* Some systems like hpux or Hurd do not expose peer names
>+     * for UNIX Domain Sockets, but this is irrelevant,
>+     * since compute_auth() ignores the peer name in this
>+     * case anyway.*/
>     if (getpeername(fd, sockname, &socknamelen) == -1)
>     {
>-        if (getsockname(fd, sockname, &socknamelen) == -1)
>-            return 0;  /* can only authenticate sockets */
>         if (sockname->sa_family != AF_UNIX)
>-            return 0;
>-        /* Some systems like hpux or Hurd do not expose peer names
>-         * for UNIX Domain Sockets.  We do not need it anyway.  */
>+            return 0;   /* except for AF_UNIX, sockets should have peernames */
>+        if (getsockname(fd, sockname, &socknamelen) == -1)
>+            return 0;   /* can only authenticate sockets */
>+        gotsockname = 1;
>     }
> 
>     authptr = get_authptr(sockname, socknamelen, display);
>@@ -257,14 +261,28 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display)
>         return 0;   /* cannot find good auth data */
> 
>     info->namelen = memdup(&info->name, authptr->name, authptr->name_length);
>-    if(info->namelen)
>-	ret = compute_auth(info, authptr, sockname);
>+    if (!info->namelen)
>+        goto no_auth;   /* out of memory */
>+
>+    if (!gotsockname && getsockname(fd, sockname, &socknamelen) == -1)
>+    {
>+        free(info->name);
>+        goto no_auth;   /* can only authenticate sockets */
>+    }
>+
>+    ret = compute_auth(info, authptr, sockname);
>     if(!ret)
>     {
>-	free(info->name);
>-	info->name = 0;
>-	info->namelen = 0;
>+        free(info->name);
>+        goto no_auth;   /* cannot build auth record */
>     }
>+
>     XauDisposeAuth(authptr);
>     return ret;
>+
>+ no_auth:
>+    info->name = 0;
>+    info->namelen = 0;
>+    XauDisposeAuth(authptr);
>+    return 0;
> }
>-- 
>1.6.2.1
>

Actions: View | Splinter Review

Attachments on bug 14202: 13861 | 24646 | 24681 | 24745

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.