From patchwork Tue Mar 7 11:46:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: abushwang X-Patchwork-Id: 66075 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 07057385B52D for ; Tue, 7 Mar 2023 11:46:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 07057385B52D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678189601; bh=jIB52aO5aZDtQTGWSm2yvZlnAfG1mVA/5pGiJKI/eak=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=wwd0800xhwfEoL5fwPDxr0otBwoubDQj+1SuLC6Gbqse7LZwrVLLwA6PPzIIAMutX demVaBRkijma3RdmABvyNVuJjEO5Zd2BtLp3uynNvX9cNUFDt0Gz3B6vFuKMhtO8k6 GP9jaJH4wp0AmtnZvXmtdleU25tSIcSS+t43DOEg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id D41E23858D39 for ; Tue, 7 Mar 2023 11:46:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D41E23858D39 Received: by mail-pl1-x62a.google.com with SMTP id p20so13680783plw.13 for ; Tue, 07 Mar 2023 03:46:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678189578; 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=jIB52aO5aZDtQTGWSm2yvZlnAfG1mVA/5pGiJKI/eak=; b=6oziefxkWsTlLdkjjscpoH+jBu6SMDlL0DqM3klOqgWk65LA6cTI+f8vdK0+cy4Eq2 N25mHnguU1oIlvFm4VghdzRDeN99nwtu/FZJ8GwSr/T9zV/DzCn0JlJZw+xW7KhrndXE euLAg3HNG6xEE0uVFHBeGGInT9IpruAeQBC9er4sQE80eMdv7F5crK7oCKpqsa/9kI+t iWxBWa2hhqRp29OAoSy9Z6JQXZ0t80LYjTzRSqFxAsfhxPmN89MW2iu1MC1tmr+kY+aP lkBN6J7jbuhoUdavr442kxB+Kh2bgHHZp2ai0UypA9cEWcLIt0TvRhGYBryw1DPq6eoq vkpw== X-Gm-Message-State: AO0yUKUh6xgMa9Dxgtwn8U0hyJbRKpV/z70zc36TorbA62kYpbYqvYRL iktqLr7HK1QfWii/ZiprKcPGEzLVpDIBgw== X-Google-Smtp-Source: AK7set8lVNIfg9ZkEbIcYqjuSTfmKCtgysygxXG+zQHz5VUZDosZhP6bN+XdORg25kxM4/r8y5bb6A== X-Received: by 2002:a17:903:230d:b0:19a:a546:2959 with SMTP id d13-20020a170903230d00b0019aa5462959mr20334109plh.19.1678189578541; Tue, 07 Mar 2023 03:46:18 -0800 (PST) Received: from localhost.localdomain ([43.132.141.8]) by smtp.gmail.com with ESMTPSA id li11-20020a170903294b00b0017a032d7ae4sm8270710plb.104.2023.03.07.03.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 03:46:18 -0800 (PST) To: libc-alpha@sourceware.org, carlos@redhat.com, xry111@xry111.site Cc: abushwang Subject: [PATCH v3] rt: fix shm_open not set ENAMETOOLONG when name exceeds {_POSIX_PATH_MAX} Date: Tue, 7 Mar 2023 19:46:13 +0800 Message-Id: <20230307114613.791793-1-abushwangs@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.9 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: abushwang via Libc-alpha From: abushwang Reply-To: abushwang Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 +++-- 2 files changed, 12 insertions(+), 5 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; }