Attachment 85565 Details for Bug 69073 – [PATCH 2/2] Allow EPROTOTYPE for SOCK_CLOEXEC but unsupported by socket/socketpair

[patch] [PATCH 2/2] Allow EPROTOTYPE for SOCK_CLOEXEC but unsupported by socket/socketpair

0002-Allow-EPROTOTYPE-for-SOCK_CLOEXEC-but-unsupported-by.patch (text/plain), 1.73 KB, created by Chengwei Yang on 2013-09-10 14:48:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-09-10 14:48:01 UTC

Size: 1.73 KB

patch

obsolete

>From 4fdb9c10140f0affeb9eddd493868b0cbc8a5f19 Mon Sep 17 00:00:00 2001
>From: Pino Toscano <toscano.pino@tiscali.it>
>Date: Tue, 10 Sep 2013 22:34:07 +0800
>Subject: [PATCH 2/2] Allow EPROTOTYPE for SOCK_CLOEXEC but unsupported by
> socket/socketpair
>
>If SOCK_CLOEXEC is defined (usually because accept4 is implemented),
>check for EPROTOTYPE (the POSIX errno for invalid socket types) in
>addition to EINVAL as errno indicating whether socket and socketpair
>do not support SOCK_CLOEXEC (and other SOCK_* flags).
>---
> dbus/dbus-sysdeps-unix.c |    6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index 1face5c..9267c6e 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -144,7 +144,7 @@ _dbus_open_socket (int              *fd_p,
>   cloexec_done = *fd_p >= 0;
> 
>   /* Check if kernel seems to be too old to know SOCK_CLOEXEC */
>-  if (*fd_p < 0 && errno == EINVAL)
>+  if (*fd_p < 0 && (errno == EINVAL || errno == EPROTOTYPE))
> #endif
>     {
>       *fd_p = socket (domain, type, protocol);
>@@ -903,7 +903,7 @@ _dbus_connect_exec (const char     *path,
>   retval = socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0, fds);
>   cloexec_done = retval >= 0;
> 
>-  if (retval < 0 && (errno == EINVAL))
>+  if (retval < 0 && (errno == EINVAL || errno == EPROTOTYPE))
> #endif
>     {
>       retval = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
>@@ -3081,7 +3081,7 @@ _dbus_full_duplex_pipe (int        *fd1,
>   retval = socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0, fds);
>   cloexec_done = retval >= 0;
> 
>-  if (retval < 0 && errno == EINVAL)
>+  if (retval < 0 && (errno == EINVAL || errno == EPROTOTYPE))
> #endif
>     {
>       retval = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 69073: 85398 | 85564 | 85565

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.