From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by sourceware.org (Postfix) with ESMTPS id 978DF3858D39 for ; Tue, 7 Mar 2023 12:16:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 978DF3858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pj1-x102c.google.com with SMTP id qa18-20020a17090b4fd200b0023750b675f5so16296209pjb.3 for ; Tue, 07 Mar 2023 04:16:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678191389; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HNV6AmSFBDRxciHba1N5loWgQBO+MVobt5zrxnaGM9A=; b=g7wXwfXmE6AXh8ibmZucJPISU+PWsviYb5G8ObaPizfSWD+4WTiyilJp7u9vGC+UHJ 93u7M/pvvPyKLpWZ6z51RzFiKMNxJ77AvirWhjRgbg+0hPYGEy754D3fD6SB5lz5+d9b sq9OUukZBF6RPh86+ZVQTNHVIwu2HSOfwwnrsmrqFnAvNaYNckcLiJfjeUGjaarOvTnl SWVsMzfz/IS+O8vCQLxVrlNZ7+GAi6n2hAIHIboJi8VxDU6swQyr3sFpiwT+z7vakAM7 +WHPQpjQBsHmAv0dqjDvUIKg+yFxOic2i6eh06Qy0/zZSdWpdv2UI19OCwbrzBG48dVo /o3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678191389; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HNV6AmSFBDRxciHba1N5loWgQBO+MVobt5zrxnaGM9A=; b=cuCq5YerTrpD0n8IRU7bVSEtYxkTTj/rpKMfn74FLWpzVYjlepMmk2LT1uCUuUBcZ5 ZWNDekJrK0kNyFg20FVKVBMDevBvsj8Yi92odAQGbqcWoMyjBPnmUMqTP9EaeduKct1E vfWlgfNBAzEi1F3vpVUUTpw2V9uSsKIFi3Mhx5ooBKrgjClX3x5tHQ1A7BK4Ym7nUVbf L5c40JwG2Sfb4AZ0ftk3wY5n3k2D3vjG+3j0kgcAHV3lf/8ygzblWQTYmLE2BVkDLpsz ldgblDKPP3pV6WLby+t3E9zeMRZIZxficx6OaqaqiBcSmXsEtbi2FCt3BSOJUOBB4x8K UNLA== X-Gm-Message-State: AO0yUKUtQeGEk2Esq73zym+3C2xzjbH/ak5Ubw5Lrob6VnBP3EaZTZM7 H6y2lXDA2rr4Sc1lW3bX52nq0AkVcipePw== X-Google-Smtp-Source: AK7set+12tzqc0aQTLZEu/0PjjiOto5fIF4YN6AMVY6HmBO3ZT+OmXJEUOuJTJaG3j9z6YKYXpL3oA== X-Received: by 2002:a17:902:e801:b0:19b:afb:b92e with SMTP id u1-20020a170902e80100b0019b0afbb92emr18313580plg.40.1678191389293; Tue, 07 Mar 2023 04:16:29 -0800 (PST) Received: from localhost.localdomain ([43.132.141.9]) by smtp.gmail.com with ESMTPSA id lh15-20020a170903290f00b0019aa5528a5csm8324341plb.144.2023.03.07.04.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 04:16:28 -0800 (PST) From: abushwang To: libc-alpha@sourceware.org, adhemerval.zanella@linaro.org Cc: abushwang Subject: [PATCH v4] rt: fix shm_open not set ENAMETOOLONG when name exceeds {_POSIX_PATH_MAX} Date: Tue, 7 Mar 2023 20:16:20 +0800 Message-Id: <20230307121620.793600-1-abushwangs@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 --- 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; } -- 2.36.1