This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH/v2 committed] sem_open: allow RAMFS_MAGIC for mount points
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Date: Sat, 8 Feb 2014 08:15:54 -0500
- Subject: [PATCH/v2 committed] sem_open: allow RAMFS_MAGIC for mount points
- Authentication-results: sourceware.org; auth=none
- References: <20140123112143 dot GU5544 at spoyarek dot pnq dot redhat dot com>
A ramfs mount supports the same requirements as a tmpfs, so accept that
as a magic type too.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
v2
- fixed style issue pointed out by Siddhesh
nptl/ChangeLog | 4 ++++
nptl/sem_open.c | 6 ++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index a4d3f45..474a473 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-08 Mike Frysinger <vapier@gentoo.org>
+
+ * sem_open.c (__where_is_shmfs): Compare f.f_type to RAMFS_MAGIC too.
+
2014-02-05 Carlos O'Donell <carlos@redhat.com>
* sysdeps/unix/sysv/linux/tst-setgetname.c (do_test): Skip the
diff --git a/nptl/sem_open.c b/nptl/sem_open.c
index 529f636..b57e6b7 100644
--- a/nptl/sem_open.c
+++ b/nptl/sem_open.c
@@ -61,7 +61,8 @@ __where_is_shmfs (void)
/* 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)
+ 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;
@@ -95,7 +96,8 @@ __where_is_shmfs (void)
/* 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)
+ if (__statfs (mp->mnt_dir, &f) != 0 || (f.f_type != SHMFS_SUPER_MAGIC
+ && f.f_type != RAMFS_MAGIC))
continue;
namelen = strlen (mp->mnt_dir);
--
1.8.5.4