diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/shm_open.c | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1ef00a8e21..5853d5e8df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-06-09 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/shm_open.c (where_is_shmfs): Try harder + to find correct mount point despite wrong information from the + kernel. + 2000-06-09 Jes Sorensen <jes@linuxcare.com> * elf/dl-libc.c (__libc_dlsym): Use DL_SYMBOL_ADDRESS() to obtain diff --git a/sysdeps/unix/sysv/linux/shm_open.c b/sysdeps/unix/sysv/linux/shm_open.c index 0cf7f5e0b3..271b92db61 100644 --- a/sysdeps/unix/sysv/linux/shm_open.c +++ b/sysdeps/unix/sysv/linux/shm_open.c @@ -38,7 +38,7 @@ static struct } mountpoint; /* This is the default directory. */ -const char defaultdir[] = "/dev/shm/"; +static const char defaultdir[] = "/dev/shm/"; /* Protect the `mountpoint' variable above. */ __libc_once_define (static, once); @@ -82,7 +82,15 @@ where_is_shmfs (void) { /* Found it. There might be more than one place where the filesystem is mounted but one is enough for us. */ - size_t namelen = strlen (mp->mnt_dir); + 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) + continue; + + namelen = strlen (mp->mnt_dir); if (namelen == 0) /* Hum, maybe some crippled entry. Keep on searching. */ |