This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/namedsem created. glibc-2.20-306-gbf645ce
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 Dec 2014 19:23:55 -0000
- Subject: GNU C Library master sources branch roland/namedsem created. glibc-2.20-306-gbf645ce
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/namedsem has been created
at bf645cede4ae3224c967b66466bf04a0afb306cd (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=bf645cede4ae3224c967b66466bf04a0afb306cd
commit bf645cede4ae3224c967b66466bf04a0afb306cd
Author: Roland McGrath <roland@hack.frob.com>
Date: Thu Dec 4 11:21:34 2014 -0800
NPTL: Refactor named semaphore code to use shm-directory.h
diff --git a/ChangeLog b/ChangeLog
index 9dec55c..2c4d47b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
2014-12-04 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/posix/shm-directory.h (SHM_GET_NAME): Take new argument
+ PREFIX, string constant to insert between directory and name.
+ * sysdeps/posix/shm_open.c: Update caller.
+ * sysdeps/posix/shm_unlink.c: Likewise.
+ * nptl/semaphoreP.h (struct mountpoint_info): Type removed.
+ (__where_is_shmfs, mountpoint, __namedsem_once): Declarations removed.
+ (SEM_SHM_PREFIX): New macro.
+ * sysdeps/posix/Makefile (librt-routines): Add shm-directory only if
+ [$(have-thread-library) = no].
+ * nptl/Makefile (libpthread-routines): Add shm-directory.
+ * nptl/Versions (GLIBC_PRIVATE): Add __shm_directory.
+ * nptl/sem_open.c (check_add_mapping): Use munmap function rather than
+ INTERNAL_SYSCALL.
+ (__where_is_shmfs): Function removed.
+ (mountpoint, defaultmount, defaultdir, __namedsem_once):
+ Variables removed.
+ (sem_open): Use close function rather than INTERNAL_SYSCALL.
+ Use SHM_GET_NAME.
+ * nptl/sem_unlink.c: Prototypify. Use SHM_GET_NAME.
+
* sysdeps/posix/shm-directory.c: New file.
* sysdeps/posix/shm-directory.h: New file.
* sysdeps/posix/Makefile [($(subdir) = rt] (librt-routines): Add it.
diff --git a/nptl/Makefile b/nptl/Makefile
index ac76596..3d61ec1 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -96,6 +96,7 @@ libpthread-routines = nptl-init vars events version \
old_pthread_atfork pthread_atfork \
pthread_getcpuclockid \
pthread_clock_gettime pthread_clock_settime \
+ shm-directory \
sem_init sem_destroy \
sem_open sem_close sem_unlink \
sem_getvalue \
diff --git a/nptl/Versions b/nptl/Versions
index b7d4a9b..4e134fa 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -270,5 +270,6 @@ libpthread {
__pthread_initialize_minimal;
__pthread_clock_gettime; __pthread_clock_settime;
__pthread_unwind; __pthread_get_minstack;
+ __shm_directory;
}
}
diff --git a/nptl/sem_open.c b/nptl/sem_open.c
index cf91859..31e15fe 100644
--- a/nptl/sem_open.c
+++ b/nptl/sem_open.c
@@ -18,8 +18,6 @@
#include <errno.h>
#include <fcntl.h>
-#include <mntent.h>
-#include <paths.h>
#include <pthread.h>
#include <search.h>
#include <semaphore.h>
@@ -30,98 +28,8 @@
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <linux_fsinfo.h>
#include "semaphoreP.h"
-
-
-
-/* Information about the mount point. */
-struct mountpoint_info mountpoint attribute_hidden;
-
-/* This is the default mount point. */
-static const char defaultmount[] = "/dev/shm";
-/* This is the default directory. */
-static const char defaultdir[] = "/dev/shm/sem.";
-
-/* Protect the `mountpoint' variable above. */
-pthread_once_t __namedsem_once attribute_hidden = PTHREAD_ONCE_INIT;
-
-
-/* Determine where the shmfs is mounted (if at all). */
-void
-attribute_hidden
-__where_is_shmfs (void)
-{
- char buf[512];
- struct statfs f;
- struct mntent resmem;
- struct mntent *mp;
- FILE *fp;
-
- /* The canonical place is /dev/shm. This is at least what the
- documentation tells everybody to do. */
- if (__statfs (defaultmount, &f) == 0 && (f.f_type == SHMFS_SUPER_MAGIC
- || f.f_type == RAMFS_MAGIC))
- {
- /* It is in the normal place. */
- mountpoint.dir = (char *) defaultdir;
- mountpoint.dirlen = sizeof (defaultdir) - 1;
-
- return;
- }
-
- /* OK, do it the hard way. Look through the /proc/mounts file and if
- this does not exist through /etc/fstab to find the mount point. */
- fp = __setmntent ("/proc/mounts", "r");
- if (__glibc_unlikely (fp == NULL))
- {
- fp = __setmntent (_PATH_MNTTAB, "r");
- if (__glibc_unlikely (fp == NULL))
- /* There is nothing we can do. Blind guesses are not helpful. */
- return;
- }
-
- /* Now read the entries. */
- while ((mp = __getmntent_r (fp, &resmem, buf, sizeof buf)) != NULL)
- /* The original name is "shm" but this got changed in early Linux
- 2.4.x to "tmpfs". */
- if (strcmp (mp->mnt_type, "tmpfs") == 0
- || strcmp (mp->mnt_type, "shm") == 0)
- {
- /* Found it. There might be more than one place where the
- filesystem is mounted but one is enough for us. */
- size_t namelen;
-
- /* First make sure this really is the correct entry. At least
- some versions of the kernel give wrong information because
- of the implicit mount of the shmfs for SysV IPC. */
- if (__statfs (mp->mnt_dir, &f) != 0 || (f.f_type != SHMFS_SUPER_MAGIC
- && f.f_type != RAMFS_MAGIC))
- continue;
-
- namelen = strlen (mp->mnt_dir);
-
- if (namelen == 0)
- /* Hum, maybe some crippled entry. Keep on searching. */
- continue;
-
- mountpoint.dir = (char *) malloc (namelen + 4 + 2);
- if (mountpoint.dir != NULL)
- {
- char *cp = __mempcpy (mountpoint.dir, mp->mnt_dir, namelen);
- if (cp[-1] != '/')
- *cp++ = '/';
- cp = stpcpy (cp, "sem.");
- mountpoint.dirlen = cp - mountpoint.dir;
- }
-
- break;
- }
-
- /* Close the stream. */
- __endmntent (fp);
-}
+#include <shm-directory.h>
/* Comparison function for search of existing mapping. */
@@ -217,8 +125,9 @@ check_add_mapping (const char *name, size_t namelen, int fd, sem_t *existing)
if (result != existing && existing != SEM_FAILED && existing != MAP_FAILED)
{
/* Do not disturb errno. */
- INTERNAL_SYSCALL_DECL (err);
- INTERNAL_SYSCALL (munmap, err, 2, existing, sizeof (sem_t));
+ int save = errno;
+ munmap (existing, sizeof (sem_t));
+ errno = save;
}
return result;
@@ -228,42 +137,17 @@ check_add_mapping (const char *name, size_t namelen, int fd, sem_t *existing)
sem_t *
sem_open (const char *name, int oflag, ...)
{
- char *finalname;
- sem_t *result = SEM_FAILED;
int fd;
+ sem_t *result;
- /* Determine where the shmfs is mounted. */
- __pthread_once (&__namedsem_once, __where_is_shmfs);
-
- /* If we don't know the mount points there is nothing we can do. Ever. */
- if (mountpoint.dir == NULL)
- {
- __set_errno (ENOSYS);
- return SEM_FAILED;
- }
-
- /* Construct the filename. */
- while (name[0] == '/')
- ++name;
-
- if (name[0] == '\0')
- {
- /* The name "/" is not supported. */
- __set_errno (EINVAL);
- return SEM_FAILED;
- }
- size_t namelen = strlen (name) + 1;
-
- /* Create the name of the final file. */
- finalname = (char *) alloca (mountpoint.dirlen + namelen);
- __mempcpy (__mempcpy (finalname, mountpoint.dir, mountpoint.dirlen),
- name, namelen);
+ /* Create the name of the final file in local variable SHM_NAME. */
+ SHM_GET_NAME (EINVAL, SEM_FAILED, SEM_SHM_PREFIX);
/* If the semaphore object has to exist simply open it. */
if ((oflag & O_CREAT) == 0 || (oflag & O_EXCL) == 0)
{
try_again:
- fd = __libc_open (finalname,
+ fd = __libc_open (shm_name,
(oflag & ~(O_CREAT|O_ACCMODE)) | O_NOFOLLOW | O_RDWR);
if (fd == -1)
@@ -317,8 +201,8 @@ sem_open (const char *name, int oflag, ...)
memset ((char *) &sem.initsem + sizeof (struct new_sem), '\0',
sizeof (sem_t) - sizeof (struct new_sem));
- tmpfname = (char *) alloca (mountpoint.dirlen + 6 + 1);
- char *xxxxxx = __mempcpy (tmpfname, mountpoint.dir, mountpoint.dirlen);
+ tmpfname = __alloca (shm_dirlen + sizeof SEM_SHM_PREFIX + 6);
+ char *xxxxxx = __mempcpy (tmpfname, shm_dir, shm_dirlen);
int retries = 0;
#define NRETRIES 50
@@ -361,7 +245,7 @@ sem_open (const char *name, int oflag, ...)
fd, 0)) != MAP_FAILED)
{
/* Create the file. Don't overwrite an existing file. */
- if (link (tmpfname, finalname) != 0)
+ if (link (tmpfname, shm_name) != 0)
{
/* Undo the mapping. */
(void) munmap (result, sizeof (sem_t));
@@ -402,8 +286,9 @@ sem_open (const char *name, int oflag, ...)
if (fd != -1)
{
/* Do not disturb errno. */
- INTERNAL_SYSCALL_DECL (err);
- INTERNAL_SYSCALL (close, err, 1, fd);
+ int save = errno;
+ close (fd);
+ errno = save;
}
return result;
diff --git a/nptl/sem_unlink.c b/nptl/sem_unlink.c
index 485a3b8..04abd31 100644
--- a/nptl/sem_unlink.c
+++ b/nptl/sem_unlink.c
@@ -22,44 +22,16 @@
#include <string.h>
#include <unistd.h>
#include "semaphoreP.h"
-
+#include <shm-directory.h>
int
-sem_unlink (name)
- const char *name;
+sem_unlink (const char *name)
{
- char *fname;
- size_t namelen;
-
- /* Determine where the shmfs is mounted. */
- __pthread_once (&__namedsem_once, __where_is_shmfs);
-
- /* If we don't know the mount points there is nothing we can do. Ever. */
- if (mountpoint.dir == NULL)
- {
- __set_errno (ENOSYS);
- return -1;
- }
-
/* Construct the filename. */
- while (name[0] == '/')
- ++name;
-
- if (name[0] == '\0')
- {
- /* The name "/" is not supported. */
- __set_errno (ENOENT);
- return -1;
- }
- namelen = strlen (name);
-
- /* Create the name of the file. */
- fname = (char *) alloca (mountpoint.dirlen + namelen + 1);
- __mempcpy (__mempcpy (fname, mountpoint.dir, mountpoint.dirlen),
- name, namelen + 1);
+ SHM_GET_NAME (ENOENT, -1, SEM_SHM_PREFIX);
/* Now try removing it. */
- int ret = unlink (fname);
+ int ret = unlink (shm_name);
if (ret < 0 && errno == EPERM)
__set_errno (EACCES);
return ret;
diff --git a/nptl/semaphoreP.h b/nptl/semaphoreP.h
index 5e6a701..7ab5039 100644
--- a/nptl/semaphoreP.h
+++ b/nptl/semaphoreP.h
@@ -19,13 +19,7 @@
#include <semaphore.h>
#include "pthreadP.h"
-
-/* Mount point of the shared memory filesystem. */
-struct mountpoint_info
-{
- char *dir;
- size_t dirlen;
-};
+#define SEM_SHM_PREFIX "sem."
/* Keeping track of currently used mappings. */
struct inuse_sem
@@ -38,11 +32,6 @@ struct inuse_sem
};
-/* Variables used in multiple interfaces. */
-extern struct mountpoint_info mountpoint attribute_hidden;
-
-extern pthread_once_t __namedsem_once attribute_hidden;
-
/* The search tree for existing mappings. */
extern void *__sem_mappings attribute_hidden;
@@ -50,9 +39,6 @@ extern void *__sem_mappings attribute_hidden;
extern int __sem_mappings_lock attribute_hidden;
-/* Initializer for mountpoint. */
-extern void __where_is_shmfs (void) attribute_hidden;
-
/* Comparison function for search in tree with existing mappings. */
extern int __sem_search (const void *a, const void *b) attribute_hidden;
diff --git a/sysdeps/posix/Makefile b/sysdeps/posix/Makefile
index 8e5f7c3..52f20f5 100644
--- a/sysdeps/posix/Makefile
+++ b/sysdeps/posix/Makefile
@@ -4,6 +4,8 @@ TMP_MAX = 238328
L_ctermid = 9
L_cuserid = 9
-ifeq ($(subdir),rt)
+ifeq ($(subdir)|$(have-thread-library),rt|no)
+# With NPTL, this lives in libpthread so it can be used for sem_open too.
+# Without NPTL, it's just private in librt.
librt-routines += shm-directory
endif
diff --git a/sysdeps/posix/shm-directory.h b/sysdeps/posix/shm-directory.h
index 1c4d965..84f1f94 100644
--- a/sysdeps/posix/shm-directory.h
+++ b/sysdeps/posix/shm-directory.h
@@ -36,9 +36,10 @@ extern const char *__shm_directory (size_t *len);
strlen (NAME) + 1. If NAME is invalid, it sets errno to
ERRNO_FOR_INVALID and returns RETVAL_FOR_INVALID. Finally, it defines
the local variable SHM_NAME, giving the absolute file name of the shm
- file corresponding to NAME. */
+ file corresponding to NAME. PREFIX is a string constant used as a
+ prefix on NAME. */
-#define SHM_GET_NAME(errno_for_invalid, retval_for_invalid) \
+#define SHM_GET_NAME(errno_for_invalid, retval_for_invalid, prefix) \
size_t shm_dirlen; \
const char *shm_dir = __shm_directory (&shm_dirlen); \
/* If we don't know what directory to use, there is nothing we can do. */ \
@@ -57,7 +58,9 @@ extern const char *__shm_directory (size_t *len);
__set_errno (errno_for_invalid); \
return retval_for_invalid; \
} \
- char *shm_name = __alloca (shm_dirlen + namelen); \
- __mempcpy (__mempcpy (shm_name, shm_dir, shm_dirlen), name, namelen)
+ char *shm_name = __alloca (shm_dirlen + sizeof prefix - 1 + namelen); \
+ __mempcpy (__mempcpy (__mempcpy (shm_name, shm_dir, shm_dirlen), \
+ prefix, sizeof prefix - 1), \
+ name, namelen)
#endif /* shm-directory.h */
diff --git a/sysdeps/posix/shm_open.c b/sysdeps/posix/shm_open.c
index 064fecf..1f017c5 100644
--- a/sysdeps/posix/shm_open.c
+++ b/sysdeps/posix/shm_open.c
@@ -32,7 +32,7 @@
int
shm_open (const char *name, int oflag, mode_t mode)
{
- SHM_GET_NAME (EINVAL, -1);
+ SHM_GET_NAME (EINVAL, -1, "");
# ifdef O_NOFOLLOW
oflag |= O_NOFOLLOW;
diff --git a/sysdeps/posix/shm_unlink.c b/sysdeps/posix/shm_unlink.c
index 81c3a02..7d69c63 100644
--- a/sysdeps/posix/shm_unlink.c
+++ b/sysdeps/posix/shm_unlink.c
@@ -32,7 +32,7 @@
int
shm_unlink (const char *name)
{
- SHM_GET_NAME (ENOENT, -1);
+ SHM_GET_NAME (ENOENT, -1, "");
int result = unlink (shm_name);
if (result < 0 && errno == EPERM)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a0c8598085a5963679e4fe90c98d4879ead97c6f
commit a0c8598085a5963679e4fe90c98d4879ead97c6f
Author: Roland McGrath <roland@hack.frob.com>
Date: Thu Dec 4 11:21:19 2014 -0800
Refactor shm_{open,unlink} code to separate Linux-specific directory choice from POSIX-generic code.
diff --git a/ChangeLog b/ChangeLog
index 5134d11..9dec55c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2014-12-04 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/posix/shm-directory.c: New file.
+ * sysdeps/posix/shm-directory.h: New file.
+ * sysdeps/posix/Makefile [($(subdir) = rt] (librt-routines): Add it.
+ * sysdeps/posix/shm_open.c: Use SHM_GET_NAME.
+ Use O_NOFOLLOW and O_CLOEXEC if available. Transmute EISDIR to EINVAL.
+ * sysdeps/posix/shm_unlink.c: Use SHM_GET_NAME.
+ Transmute EPERM to EACCES.
+ * sysdeps/unix/sysv/linux/shm-directory.c: New file, most code taken
+ from ...
+ * sysdeps/unix/sysv/linux/shm_open.c: ... here. File removed.
+ * sysdeps/unix/sysv/linux/shm_unlink.c: File removed.
+
2014-12-04 Joseph Myers <joseph@codesourcery.com>
* conform/list-header-symbols.pl (%extra_syms): Add h_errno for
diff --git a/sysdeps/posix/Makefile b/sysdeps/posix/Makefile
index b58aa6a..8e5f7c3 100644
--- a/sysdeps/posix/Makefile
+++ b/sysdeps/posix/Makefile
@@ -3,3 +3,7 @@ L_tmpnam = 20
TMP_MAX = 238328
L_ctermid = 9
L_cuserid = 9
+
+ifeq ($(subdir),rt)
+librt-routines += shm-directory
+endif
diff --git a/sysdeps/posix/shm-directory.c b/sysdeps/posix/shm-directory.c
new file mode 100644
index 0000000..aea5f96
--- /dev/null
+++ b/sysdeps/posix/shm-directory.c
@@ -0,0 +1,35 @@
+/* Determine directory for shm/sem files. Generic POSIX version.
+ Copyright (C) 2014 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include "shm-directory.h"
+#include <unistd.h>
+
+#if _POSIX_MAPPED_FILES
+
+# include <paths.h>
+
+# define SHMDIR (_PATH_DEV "shm/")
+
+const char *
+__shm_directory (size_t *len)
+{
+ *len = sizeof SHMDIR - 1;
+ return SHMDIR;
+}
+
+#endif
diff --git a/sysdeps/posix/shm-directory.h b/sysdeps/posix/shm-directory.h
new file mode 100644
index 0000000..1c4d965
--- /dev/null
+++ b/sysdeps/posix/shm-directory.h
@@ -0,0 +1,63 @@
+/* Header for directory for shm/sem files.
+ Copyright (C) 2014 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _SHM_DIRECTORY_H
+
+#include <errno.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+extern const char *__shm_directory (size_t *len);
+
+/* This defines local variables SHM_DIR and SHM_DIRLEN, giving the
+ directory prefix (with trailing slash) and length (not including '\0'
+ terminator) of the directory used for shm files. If that cannot be
+ determined, it sets errno to ENOSYS and returns RETVAL_FOR_INVALID.
+
+ This uses the local variable NAME as an lvalue, and increments it past
+ any leading slashes. It then defines the local variable NAMELEN, giving
+ strlen (NAME) + 1. If NAME is invalid, it sets errno to
+ ERRNO_FOR_INVALID and returns RETVAL_FOR_INVALID. Finally, it defines
+ the local variable SHM_NAME, giving the absolute file name of the shm
+ file corresponding to NAME. */
+
+#define SHM_GET_NAME(errno_for_invalid, retval_for_invalid) \
+ size_t shm_dirlen; \
+ const char *shm_dir = __shm_directory (&shm_dirlen); \
+ /* If we don't know what directory to use, there is nothing we can do. */ \
+ if (__glibc_unlikely (shm_dir == NULL)) \
+ { \
+ __set_errno (ENOSYS); \
+ return retval_for_invalid; \
+ } \
+ /* Construct the filename. */ \
+ while (name[0] == '/') \
+ ++name; \
+ size_t namelen = strlen (name) + 1; \
+ /* Validate the filename. */ \
+ if (namelen == 1 || namelen >= NAME_MAX || strchr (name, '/') != NULL) \
+ { \
+ __set_errno (errno_for_invalid); \
+ return retval_for_invalid; \
+ } \
+ char *shm_name = __alloca (shm_dirlen + namelen); \
+ __mempcpy (__mempcpy (shm_name, shm_dir, shm_dirlen), name, namelen)
+
+#endif /* shm-directory.h */
diff --git a/sysdeps/posix/shm_open.c b/sysdeps/posix/shm_open.c
index 456b3d8..064fecf 100644
--- a/sysdeps/posix/shm_open.c
+++ b/sysdeps/posix/shm_open.c
@@ -19,50 +19,41 @@
#include <unistd.h>
#if ! _POSIX_MAPPED_FILES
-#include <rt/shm_open.c>
+
+# include <rt/shm_open.c>
#else
-#include <errno.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <paths.h>
+# include <fcntl.h>
+# include <shm-directory.h>
-#define SHMDIR (_PATH_DEV "shm/")
/* Open shared memory object. */
int
shm_open (const char *name, int oflag, mode_t mode)
{
- size_t namelen;
- char *fname;
- int fd;
-
- /* Construct the filename. */
- while (name[0] == '/')
- ++name;
-
- if (name[0] == '\0')
- {
- /* The name "/" is not supported. */
- __set_errno (EINVAL);
- return -1;
- }
-
- namelen = strlen (name);
- fname = (char *) __alloca (sizeof SHMDIR - 1 + namelen + 1);
- __mempcpy (__mempcpy (fname, SHMDIR, sizeof SHMDIR - 1),
- name, namelen + 1);
-
- fd = open (name, oflag, mode);
+ SHM_GET_NAME (EINVAL, -1);
+
+# ifdef O_NOFOLLOW
+ oflag |= O_NOFOLLOW;
+# endif
+# ifdef O_CLOEXEC
+ oflag |= O_CLOEXEC;
+# endif
+ int fd = open (shm_name, oflag, mode);
+ if (fd == -1 && __glibc_unlikely (errno == EISDIR))
+ /* It might be better to fold this error with EINVAL since
+ directory names are just another example for unsuitable shared
+ object names and the standard does not mention EISDIR. */
+ __set_errno (EINVAL);
+
+# ifndef O_CLOEXEC
if (fd != -1)
{
/* We got a descriptor. Now set the FD_CLOEXEC bit. */
int flags = fcntl (fd, F_GETFD, 0);
- if (__builtin_expect (flags, 0) != -1)
+ if (__glibc_likely (flags != -1))
{
flags |= FD_CLOEXEC;
flags = fcntl (fd, F_SETFD, flags);
@@ -77,8 +68,9 @@ shm_open (const char *name, int oflag, mode_t mode)
__set_errno (save_errno);
}
}
+# endif
return fd;
}
-#endif
+#endif /* _POSIX_MAPPED_FILES */
diff --git a/sysdeps/posix/shm_unlink.c b/sysdeps/posix/shm_unlink.c
index dc94e16..81c3a02 100644
--- a/sysdeps/posix/shm_unlink.c
+++ b/sysdeps/posix/shm_unlink.c
@@ -24,37 +24,20 @@
#else
#include <errno.h>
-#include <sys/mman.h>
#include <string.h>
-#include <stdlib.h>
-#include <paths.h>
+#include "shm-directory.h"
-#define SHMDIR (_PATH_DEV "shm/")
/* Remove shared memory object. */
int
shm_unlink (const char *name)
{
- size_t namelen;
- char *fname;
-
- /* Construct the filename. */
- while (name[0] == '/')
- ++name;
-
- if (name[0] == '\0')
- {
- /* The name "/" is not supported. */
- __set_errno (EINVAL);
- return -1;
- }
-
- namelen = strlen (name);
- fname = (char *) __alloca (sizeof SHMDIR - 1 + namelen + 1);
- __mempcpy (__mempcpy (fname, SHMDIR, sizeof SHMDIR - 1),
- name, namelen + 1);
-
- return unlink (name);
+ SHM_GET_NAME (ENOENT, -1);
+
+ int result = unlink (shm_name);
+ if (result < 0 && errno == EPERM)
+ __set_errno (EACCES);
+ return result;
}
#endif
diff --git a/sysdeps/unix/sysv/linux/shm-directory.c b/sysdeps/unix/sysv/linux/shm-directory.c
new file mode 100644
index 0000000..9340f9c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/shm-directory.c
@@ -0,0 +1,144 @@
+/* Determine directory for shm/sem files. Linux version.
+ Copyright (C) 2000-2014 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include "shm-directory.h"
+
+#include <errno.h>
+#include <mntent.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/statfs.h>
+#include <bits/libc-lock.h>
+#include "linux_fsinfo.h"
+
+
+/* Mount point of the shared memory filesystem. */
+static struct
+{
+ char *dir;
+ size_t dirlen;
+} mountpoint;
+
+/* This is the default directory. */
+static const char defaultdir[] = "/dev/shm/";
+
+/* Protect the `mountpoint' variable above. */
+__libc_once_define (static, once);
+
+
+/* Determine where the shmfs is mounted (if at all). */
+static void
+where_is_shmfs (void)
+{
+ char buf[512];
+ struct statfs f;
+ struct mntent resmem;
+ struct mntent *mp;
+ FILE *fp;
+
+ /* The canonical place is /dev/shm. This is at least what the
+ documentation tells everybody to do. */
+ if (__statfs (defaultdir, &f) == 0 && (f.f_type == SHMFS_SUPER_MAGIC
+ || f.f_type == RAMFS_MAGIC))
+ {
+ /* It is in the normal place. */
+ mountpoint.dir = (char *) defaultdir;
+ mountpoint.dirlen = sizeof (defaultdir) - 1;
+
+ return;
+ }
+
+ /* OK, do it the hard way. Look through the /proc/mounts file and if
+ this does not exist through /etc/fstab to find the mount point. */
+ fp = __setmntent ("/proc/mounts", "r");
+ if (__glibc_unlikely (fp == NULL))
+ {
+ fp = __setmntent (_PATH_MNTTAB, "r");
+ if (__glibc_unlikely (fp == NULL))
+ /* There is nothing we can do. Blind guesses are not helpful. */
+ return;
+ }
+
+ /* Now read the entries. */
+ while ((mp = __getmntent_r (fp, &resmem, buf, sizeof buf)) != NULL)
+ /* The original name is "shm" but this got changed in early Linux
+ 2.4.x to "tmpfs". */
+ if (strcmp (mp->mnt_type, "tmpfs") == 0
+ || strcmp (mp->mnt_type, "shm") == 0)
+ {
+ /* Found it. There might be more than one place where the
+ filesystem is mounted but one is enough for us. */
+ size_t namelen;
+
+ /* First make sure this really is the correct entry. At least
+ some versions of the kernel give wrong information because
+ of the implicit mount of the shmfs for SysV IPC. */
+ if (__statfs (mp->mnt_dir, &f) != 0 || (f.f_type != SHMFS_SUPER_MAGIC
+ && f.f_type != RAMFS_MAGIC))
+ continue;
+
+ namelen = strlen (mp->mnt_dir);
+
+ if (namelen == 0)
+ /* Hum, maybe some crippled entry. Keep on searching. */
+ continue;
+
+ mountpoint.dir = (char *) malloc (namelen + 2);
+ if (mountpoint.dir != NULL)
+ {
+ char *cp = __mempcpy (mountpoint.dir, mp->mnt_dir, namelen);
+ if (cp[-1] != '/')
+ *cp++ = '/';
+ *cp = '\0';
+ mountpoint.dirlen = cp - mountpoint.dir;
+ }
+
+ break;
+ }
+
+ /* Close the stream. */
+ __endmntent (fp);
+}
+
+
+const char *
+__shm_directory (size_t *len)
+{
+ /* Determine where the shmfs is mounted. */
+ __libc_once (once, where_is_shmfs);
+
+ /* If we don't know the mount points there is nothing we can do. Ever. */
+ if (__glibc_unlikely (mountpoint.dir == NULL))
+ {
+ __set_errno (ENOSYS);
+ return NULL;
+ }
+
+ *len = mountpoint.dirlen;
+ return mountpoint.dir;
+}
+
+
+/* Make sure the table is freed if we want to free everything before
+ exiting. */
+libc_freeres_fn (freeit)
+{
+ if (mountpoint.dir != defaultdir)
+ free (mountpoint.dir);
+}
diff --git a/sysdeps/unix/sysv/linux/shm_open.c b/sysdeps/unix/sysv/linux/shm_open.c
deleted file mode 100644
index a0fa958..0000000
--- a/sysdeps/unix/sysv/linux/shm_open.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* Copyright (C) 2000-2014 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <mntent.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/statfs.h>
-#include <bits/libc-lock.h>
-#include "linux_fsinfo.h"
-
-
-/* Mount point of the shared memory filesystem. */
-static struct
-{
- char *dir;
- size_t dirlen;
-} mountpoint;
-
-/* This is the default directory. */
-static const char defaultdir[] = "/dev/shm/";
-
-/* Protect the `mountpoint' variable above. */
-__libc_once_define (static, once);
-
-
-/* Determine where the shmfs is mounted (if at all). */
-static void
-where_is_shmfs (void)
-{
- char buf[512];
- struct statfs f;
- struct mntent resmem;
- struct mntent *mp;
- FILE *fp;
-
- /* The canonical place is /dev/shm. This is at least what the
- documentation tells everybody to do. */
- if (__statfs (defaultdir, &f) == 0 && (f.f_type == SHMFS_SUPER_MAGIC
- || f.f_type == RAMFS_MAGIC))
- {
- /* It is in the normal place. */
- mountpoint.dir = (char *) defaultdir;
- mountpoint.dirlen = sizeof (defaultdir) - 1;
-
- return;
- }
-
- /* OK, do it the hard way. Look through the /proc/mounts file and if
- this does not exist through /etc/fstab to find the mount point. */
- fp = __setmntent ("/proc/mounts", "r");
- if (__glibc_unlikely (fp == NULL))
- {
- fp = __setmntent (_PATH_MNTTAB, "r");
- if (__glibc_unlikely (fp == NULL))
- /* There is nothing we can do. Blind guesses are not helpful. */
- return;
- }
-
- /* Now read the entries. */
- while ((mp = __getmntent_r (fp, &resmem, buf, sizeof buf)) != NULL)
- /* The original name is "shm" but this got changed in early Linux
- 2.4.x to "tmpfs". */
- if (strcmp (mp->mnt_type, "tmpfs") == 0
- || strcmp (mp->mnt_type, "shm") == 0)
- {
- /* Found it. There might be more than one place where the
- filesystem is mounted but one is enough for us. */
- size_t namelen;
-
- /* First make sure this really is the correct entry. At least
- some versions of the kernel give wrong information because
- of the implicit mount of the shmfs for SysV IPC. */
- if (__statfs (mp->mnt_dir, &f) != 0 || (f.f_type != SHMFS_SUPER_MAGIC
- && f.f_type != RAMFS_MAGIC))
- continue;
-
- namelen = strlen (mp->mnt_dir);
-
- if (namelen == 0)
- /* Hum, maybe some crippled entry. Keep on searching. */
- continue;
-
- mountpoint.dir = (char *) malloc (namelen + 2);
- if (mountpoint.dir != NULL)
- {
- char *cp = __mempcpy (mountpoint.dir, mp->mnt_dir, namelen);
- if (cp[-1] != '/')
- *cp++ = '/';
- *cp = '\0';
- mountpoint.dirlen = cp - mountpoint.dir;
- }
-
- break;
- }
-
- /* Close the stream. */
- __endmntent (fp);
-}
-
-
-/* Open shared memory object. This implementation assumes the shmfs
- implementation introduced in the late 2.3.x kernel series to be
- available. Normally the filesystem will be mounted at /dev/shm but
- we fall back on searching for the actual mount point should opening
- such a file fail. */
-int
-shm_open (const char *name, int oflag, mode_t mode)
-{
- size_t namelen;
- char *fname;
- int fd;
-
- /* Determine where the shmfs is mounted. */
- __libc_once (once, where_is_shmfs);
-
- /* If we don't know the mount points there is nothing we can do. Ever. */
- if (mountpoint.dir == NULL)
- {
- __set_errno (ENOSYS);
- return -1;
- }
-
- /* Construct the filename. */
- while (name[0] == '/')
- ++name;
-
- namelen = strlen (name);
-
- /* Validate the filename. */
- if (name[0] == '\0' || namelen > NAME_MAX || strchr (name, '/') != NULL)
- {
- __set_errno (EINVAL);
- return -1;
- }
-
- fname = (char *) alloca (mountpoint.dirlen + namelen + 1);
- __mempcpy (__mempcpy (fname, mountpoint.dir, mountpoint.dirlen),
- name, namelen + 1);
-
- /* And get the file descriptor.
- XXX Maybe we should test each descriptor whether it really is for a
- file on the shmfs. If this is what should be done the whole function
- should be revamped since we can determine whether shmfs is available
- while trying to open the file, all in one turn. */
- fd = open (fname, oflag | O_CLOEXEC | O_NOFOLLOW, mode);
- if (fd == -1 && __glibc_unlikely (errno == EISDIR))
- /* It might be better to fold this error with EINVAL since
- directory names are just another example for unsuitable shared
- object names and the standard does not mention EISDIR. */
- __set_errno (EINVAL);
-
- return fd;
-}
-
-
-/* Unlink a shared memory object. */
-int
-shm_unlink (const char *name)
-{
- size_t namelen;
- char *fname;
-
- /* Determine where the shmfs is mounted. */
- __libc_once (once, where_is_shmfs);
-
- if (mountpoint.dir == NULL)
- {
- /* We cannot find the shmfs. If `name' is really a shared
- memory object it must have been created by another process
- and we have no idea where that process found the mountpoint. */
- __set_errno (ENOENT);
- return -1;
- }
-
- /* Construct the filename. */
- while (name[0] == '/')
- ++name;
-
- namelen = strlen (name);
-
- /* Validate the filename. */
- if (name[0] == '\0' || namelen > NAME_MAX || strchr (name, '/') != NULL)
- {
- __set_errno (ENOENT);
- return -1;
- }
-
- fname = (char *) alloca (mountpoint.dirlen + namelen + 1);
- __mempcpy (__mempcpy (fname, mountpoint.dir, mountpoint.dirlen),
- name, namelen + 1);
-
- /* And remove the file. */
- int ret = unlink (fname);
- if (ret < 0 && errno == EPERM)
- __set_errno (EACCES);
- return ret;
-}
-
-
-/* Make sure the table is freed if we want to free everything before
- exiting. */
-libc_freeres_fn (freeit)
-{
- if (mountpoint.dir != defaultdir)
- free (mountpoint.dir);
-}
diff --git a/sysdeps/unix/sysv/linux/shm_unlink.c b/sysdeps/unix/sysv/linux/shm_unlink.c
deleted file mode 100644
index 55cece2..0000000
--- a/sysdeps/unix/sysv/linux/shm_unlink.c
+++ /dev/null
@@ -1 +0,0 @@
-/* This function is for technical reason defined in shm_open.c. */
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources