From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 5B82438515F9; Wed, 8 Mar 2023 13:39:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5B82438515F9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678282798; bh=4QW1H3vlBztGJKkol6gNb1944/stGbz0Qs1e2zoBAUE=; h=From:To:Subject:Date:From; b=NE5Sndu0XImOU/Y+eR5WX6Z3R0mEu4TSNxtU73IiSrWAvXc99eH5qfhuqItM88gpm BGs8VEk2NjASh0gRr/ZHRjwXjC7ldZRDm/r2KS1F/OElzjvIJLi+arrvT2fCNEuiLT 0ekBKzqxS59PL3wTSUHvlDL0DMvNOuONgmPFs6WA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] rt: fix shm_open not set ENAMETOOLONG when name exceeds {_POSIX_PATH_MAX} X-Act-Checkin: glibc X-Git-Author: abushwang X-Git-Refname: refs/heads/master X-Git-Oldrev: 65387e48097077c71ed527457c59ba59f3a1f3ee X-Git-Newrev: 0b7bf0e0a486da6be7c5dde742a80c1138f9cc89 Message-Id: <20230308133958.5B82438515F9@sourceware.org> Date: Wed, 8 Mar 2023 13:39:58 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0b7bf0e0a486da6be7c5dde742a80c1138f9cc89 commit 0b7bf0e0a486da6be7c5dde742a80c1138f9cc89 Author: abushwang Date: Tue Mar 7 20:16:20 2023 +0800 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 Reviewed-by: Adhemerval Zanella Diff: --- posix/shm-directory.c | 12 +++++++++--- rt/shm_open.c | 5 +++-- sysdeps/pthread/sem_open.c | 5 +++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/posix/shm-directory.c b/posix/shm-directory.c index 86d9fd8e4f..f130bab3c2 100644 --- a/posix/shm-directory.c +++ b/posix/shm-directory.c @@ -25,6 +25,7 @@ #include #include #include +#include int __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) alloc_buffer_copy_bytes (&buffer, "sem.", strlen ("sem.")); alloc_buffer_copy_bytes (&buffer, name, namelen + 1); - if (namelen == 0 || memchr (name, '/', namelen) != NULL - || alloc_buffer_has_failed (&buffer)) - return -1; + if (namelen == 0 || memchr (name, '/', namelen) != NULL) + return EINVAL; + if (alloc_buffer_has_failed (&buffer)) + { + if (namelen > NAME_MAX) + return ENAMETOOLONG; + return EINVAL; + } return 0; } libc_hidden_def (__shm_get_name) diff --git a/rt/shm_open.c b/rt/shm_open.c index 6c1f4d604f..fc1dc96bb4 100644 --- a/rt/shm_open.c +++ b/rt/shm_open.c @@ -30,9 +30,10 @@ int __shm_open (const char *name, int oflag, mode_t mode) { 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; } diff --git a/sysdeps/pthread/sem_open.c b/sysdeps/pthread/sem_open.c index 2551b035e1..2d32a13557 100644 --- a/sysdeps/pthread/sem_open.c +++ b/sysdeps/pthread/sem_open.c @@ -47,9 +47,10 @@ __sem_open (const char *name, int oflag, ...) } 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; }