mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
rt: fix shm_open not set ENAMETOOLONG when name exceeds {_POSIX_PATH_MAX}
according to man-pages-posix-2017, shm_open() function may fail if the length of the name argument exceeds {_POSIX_PATH_MAX} and set ENAMETOOLONG Signed-off-by: abushwang <abushwangs@gmail.com> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
parent
65387e4809
commit
0b7bf0e0a4
3 changed files with 15 additions and 7 deletions
|
@ -25,6 +25,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
int
|
int
|
||||||
__shm_get_name (struct shmdir_name *result, const char *name, bool sem_prefix)
|
__shm_get_name (struct shmdir_name *result, const char *name, bool sem_prefix)
|
||||||
|
@ -54,9 +55,14 @@ __shm_get_name (struct shmdir_name *result, const char *name, bool sem_prefix)
|
||||||
if (sem_prefix)
|
if (sem_prefix)
|
||||||
alloc_buffer_copy_bytes (&buffer, "sem.", strlen ("sem."));
|
alloc_buffer_copy_bytes (&buffer, "sem.", strlen ("sem."));
|
||||||
alloc_buffer_copy_bytes (&buffer, name, namelen + 1);
|
alloc_buffer_copy_bytes (&buffer, name, namelen + 1);
|
||||||
if (namelen == 0 || memchr (name, '/', namelen) != NULL
|
if (namelen == 0 || memchr (name, '/', namelen) != NULL)
|
||||||
|| alloc_buffer_has_failed (&buffer))
|
return EINVAL;
|
||||||
return -1;
|
if (alloc_buffer_has_failed (&buffer))
|
||||||
|
{
|
||||||
|
if (namelen > NAME_MAX)
|
||||||
|
return ENAMETOOLONG;
|
||||||
|
return EINVAL;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
libc_hidden_def (__shm_get_name)
|
libc_hidden_def (__shm_get_name)
|
||||||
|
|
|
@ -30,9 +30,10 @@ int
|
||||||
__shm_open (const char *name, int oflag, mode_t mode)
|
__shm_open (const char *name, int oflag, mode_t mode)
|
||||||
{
|
{
|
||||||
struct shmdir_name dirname;
|
struct shmdir_name dirname;
|
||||||
if (__shm_get_name (&dirname, name, false) != 0)
|
int ret =__shm_get_name (&dirname, name, false);
|
||||||
|
if (ret != 0)
|
||||||
{
|
{
|
||||||
__set_errno (EINVAL);
|
__set_errno (ret);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,9 +47,10 @@ __sem_open (const char *name, int oflag, ...)
|
||||||
}
|
}
|
||||||
|
|
||||||
struct shmdir_name dirname;
|
struct shmdir_name dirname;
|
||||||
if (__shm_get_name (&dirname, name, true) != 0)
|
int ret = __shm_get_name (&dirname, name, true);
|
||||||
|
if (ret != 0)
|
||||||
{
|
{
|
||||||
__set_errno (EINVAL);
|
__set_errno (ret);
|
||||||
return SEM_FAILED;
|
return SEM_FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue