diff mbox

Avoid warnings for unused results in nscd/connections.c

Message ID alpine.DEB.2.10.1411261900020.854@digraph.polyomino.org.uk
State Committed
Headers show

Commit Message

Joseph Myers Nov. 26, 2014, 7 p.m. UTC
This patch avoids warnings for unused results of setuid and setgid in
nscd/connections.c using an ignore_value macro along the lines
suggested by Paul in
<https://sourceware.org/ml/libc-alpha/2014-11/msg00733.html>.

(If anyone thinks the return values should not be ignored - that
ignoring them is a bug, whether security or otherwise - please file
that bug in Bugzilla.  Having the warnings around hasn't done any good
to get any such bug fixed, and it's not useful for any such bug to
block use of -Werror.)

Tested for x86_64.

2014-11-26  Joseph Myers  <joseph@codesourcery.com>

	* include/libc-internal.h (ignore_value): New macro.
	* nscd/connections.c (restart): Wrap calls to setuid and setgid
	with ignore_value.

Comments

Paul Eggert Nov. 26, 2014, 7:18 p.m. UTC | #1
Thank you, this looks good.
diff mbox

Patch

diff --git a/include/libc-internal.h b/include/libc-internal.h
index 78f82da..2ced1c1 100644
--- a/include/libc-internal.h
+++ b/include/libc-internal.h
@@ -70,4 +70,10 @@  extern void __init_misc (int, char **, char **);
 #define PTR_ALIGN_UP(base, size) \
   ((__typeof__ (base)) ALIGN_UP ((uintptr_t) (base), (size)))
 
+/* Ignore the value of an expression when a cast to void does not
+   suffice (in particular, for a call to a function declared with
+   attribute warn_unused_result).  */
+#define ignore_value(x) \
+  ({ __typeof__ (x) __ignored_value = (x); (void) __ignored_value; })
+
 #endif /* _LIBC_INTERNAL  */
diff --git a/nscd/connections.c b/nscd/connections.c
index 3e950af..1631212 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1464,7 +1464,7 @@  cannot change to old UID: %s; disabling paranoia mode"),
 cannot change to old GID: %s; disabling paranoia mode"),
 		   strerror (errno));
 
-	  setuid (server_uid);
+	  ignore_value (setuid (server_uid));
 	  paranoia = 0;
 	  return;
 	}
@@ -1479,8 +1479,8 @@  cannot change to old working directory: %s; disabling paranoia mode"),
 
       if (server_user != NULL)
 	{
-	  setuid (server_uid);
-	  setgid (server_gid);
+	  ignore_value (setuid (server_uid));
+	  ignore_value (setgid (server_gid));
 	}
       paranoia = 0;
       return;
@@ -1524,8 +1524,8 @@  cannot change to old working directory: %s; disabling paranoia mode"),
 
   if (server_user != NULL)
     {
-      setuid (server_uid);
-      setgid (server_gid);
+      ignore_value (setuid (server_uid));
+      ignore_value (setgid (server_gid));
     }
   if (chdir ("/") != 0)
     dbg_log (_("cannot change current working directory to \"/\": %s"),