AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

split assume pipe2/dup3/sock_cloexec knobs

Browse Source 
We can't assume sock_cloexec and pipe2 are bound together as the former
defines are found in glibc only while the latter are a combo of kernel
headers and glibc.  So if we do a runtime detection of SOCK_CLOEXEC, but
pipe2() is a stub inside of glibc, we hit a problem.  For example:

main()
{
	getgrnam("portage");
	if (!popen("ls", "r"))
		perror("popen()");
}

getgrnam() will detect that the kernel supports SOCK_CLOEXEC and then set
both __have_sock_cloexec and __have_pipe2 to true.  But if glibc was built
against older kernel headers where __NR_pipe2 does not exist, glibc will
have a ENOSYS stub for it.  So popen() will always fail as glibc assumes
pipe2() works.

While this isn't too much of an issue for some arches as they added the
functionality to the kernel at the same time, not all arches are that
lucky.

Since the code already has dedicated names for each feature, delete the
defines wiring these three features together and make each one a proper
dedicated knob.

We've been carrying this in Gentoo since glibc-2.9.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2012-08-17 22:03:56 -04:00
parent fdab8fd335
commit a277af22ea
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2012-08-18 Mike Frysinger <vapier@gentoo.org>
[BZ #9685]
* include/unistd.h (__have_pipe2): Change define into an extern int.
(__have_dup3): Likewise.
* socket/have_sock_cloexec.c: Include fcntl.h.
(__have_pipe2): New variable.
(__have_dup3): Likewise.
2012-08-17 Mike Frysinger <vapier@gentoo.org>
* sysdeps/unix/sysv/linux/nice.c: Adjust #include.

7
include/unistd.h
View File

@ -174,11 +174,8 @@ extern int __libc_pause (void);
extern int __pause_nocancel (void) attribute_hidden;
extern int __have_sock_cloexec;
/* At lot of other functionality became available at the same time as
SOCK_CLOEXEC. Avoid defining separate variables for all of them
unless it is really necessary. */
#define __have_pipe2 __have_sock_cloexec
#define __have_dup3 __have_sock_cloexec
extern int __have_pipe2;
extern int __have_dup3;
extern int __getlogin_r_loginuid (char *name, size_t namesize)
attribute_hidden;

11
socket/have_sock_cloexec.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2008 Free Software Foundation, Inc.
/* Copyright (C) 2008-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -15,9 +15,18 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <fcntl.h>
#include <sys/socket.h>
#include <kernel-features.h>
#if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
int __have_sock_cloexec;
#endif
#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
int __have_pipe2;
#endif
#if defined O_CLOEXEC && !defined __ASSUME_DUP3
int __have_dup3;
#endif