From patchwork Tue Mar 7 09:45:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: abushwang X-Patchwork-Id: 66070 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 406833858C30 for ; Tue, 7 Mar 2023 09:46:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 406833858C30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678182385; bh=6tpGGiJPhXbxD/u4/iwAX42rVsvNQJJgHd6uM7qGyOA=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=AhkzFhXnUAW7O5d3LwbieEEQBI6otWhQlHdi1WvOkkzbLyhj4I5XuKg+GVJq0yCa3 pejnjrFt7SMbbkI66ImMLvnzmM4lKQAeP2HvPENDj4cn2NLiqJaiUCAX5RtnutDaWI UCiBCyUjnGN7Au+05nGIzYj/nnX3+zlySI/bM4N8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id CC7CA3858D39 for ; Tue, 7 Mar 2023 09:45:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CC7CA3858D39 Received: by mail-pl1-x635.google.com with SMTP id p20so13395077plw.13 for ; Tue, 07 Mar 2023 01:45:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678182352; 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=6tpGGiJPhXbxD/u4/iwAX42rVsvNQJJgHd6uM7qGyOA=; b=d90WYMvkE/q/h16EgLSfqXEheACqynPfwg2G49zQejSbF8tANU6gOndGo36dsYBbr1 b5qudBZlkcYPVE3EW9Yqby0q35oC70kkxKUrTypR/Id0A165AASkbuIqhl/HopD2x0mF dTYMbxWHXbaXIafRFaq0PYpkXPB96Br0Yxwc1XuoSmly/3gd6wsHCGePoKyOlZv4qS3l 7l6jA/M0SSX+Dsnx7et39SMy6mJWQ8dfsE3z5sT1zimnoDB+8mpy4ogJQUZs7Up9G+O+ 11ZeJYMP2UNx6LUtDGDbOPAvz5sJDseh+kUCPewPpZ2BNSdQmaIgatkjM/dwuCHQUPgh Me8g== X-Gm-Message-State: AO0yUKVgP9KxSGpLRyaZIV09+EIpUbcI0s22ojrOXsFQgCnuvfPyAmqS Mtddq/kRFc+yQx85V64zibf8OtVUNC5nHQ== X-Google-Smtp-Source: AK7set9Gu8GjtEeq47Il0zKkHttidQ64Vk7PxgpVO7/IKFuKV7V936Gafr+YWqMffqAEPF4NdsbMjw== X-Received: by 2002:a05:6a20:8403:b0:cc:76ec:70dc with SMTP id c3-20020a056a20840300b000cc76ec70dcmr18095971pzd.26.1678182352325; Tue, 07 Mar 2023 01:45:52 -0800 (PST) Received: from localhost.localdomain ([43.132.141.3]) by smtp.gmail.com with ESMTPSA id r9-20020a62e409000000b005a54a978c1bsm7574382pfh.7.2023.03.07.01.45.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 01:45:51 -0800 (PST) To: libc-alpha@sourceware.org, carlos@redhat.com Cc: abushwang Subject: [PATCH] rt: fix shm_open not set ENAMETOOLONG when name exceeds {_POSIX_PATH_MAX} Date: Tue, 7 Mar 2023 17:45:46 +0800 Message-Id: <20230307094546.633473-1-abushwangs@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 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 | 5 +++-- rt/shm_open.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/posix/shm-directory.c b/posix/shm-directory.c index 86d9fd8e4f..ca9d9f2f77 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,9 @@ __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 + if (namelen == 0 || namelen > NAME_MAX || memchr (name, '/', namelen) != NULL || alloc_buffer_has_failed (&buffer)) - return -1; + return namelen ? ENAMETOOLONG : 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; }