Attachment 86021 Details for Bug 69492 – avoid SCM_CREDS errors for AF_INET

[patch] avoid SCM_CREDS errors for AF_INET

upstream_hurd.patch (text/plain), 972 bytes, created by Svante Signell on 2013-09-17 20:55:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Svante Signell

Created: 2013-09-17 20:55:26 UTC

Size: 972 bytes

patch

obsolete

>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -1617,6 +1627,12 @@
>   if (bytes_written < 0 && errno == EINTR)
>     goto again;
> 
>+  /* sendmsg() only accepts domain == PF_UNIX*/
>+#if defined(HAVE_CMSGCRED)
>+  if (bytes_written < 0 && errno == EINVAL)
>+    bytes_written = send (server_fd, buf, 1, 0);
>+#endif
>+
>   if (bytes_written < 0)
>     {
>       dbus_set_error (error, _dbus_error_from_errno (errno),
>@@ -1753,8 +1769,12 @@
>     }
> 
> #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
>-  if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
>-                 || cmsg.hdr.cmsg_type != SCM_CREDS)
>+  /* Special case for a zero credentials byte written */
>+  if (bytes_read == 1 && buf == '\0')
>+    {
>+    }
>+  else if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
>+      || cmsg.hdr.cmsg_type != SCM_CREDS)
>     {
>       dbus_set_error (error, DBUS_ERROR_FAILED,
>                       "Message from recvmsg() was not SCM_CREDS");

Actions: View | Splinter Review

Attachments on bug 69492: 86021 | 86076 | 86077 | 87546 | 87547 | 87548 | 88478

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.