From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id D869A3990421 for ; Thu, 3 Jun 2021 23:15:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D869A3990421 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-15-VJPX0ZUgNgiw8hk7WJCocg-1; Thu, 03 Jun 2021 19:15:04 -0400 X-MC-Unique: VJPX0ZUgNgiw8hk7WJCocg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CF241107ACE4 for ; Thu, 3 Jun 2021 23:15:03 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-228.ams2.redhat.com [10.36.113.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2E61E160 for ; Thu, 3 Jun 2021 23:15:02 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 03/35] rt: Replace generic stub of shm_open with the posix version In-Reply-To: References: X-From-Line: f870250a9c5a4113784b92ea58a1b92d47dd16e7 Mon Sep 17 00:00:00 2001 Message-Id: Date: Fri, 04 Jun 2021 01:15:00 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Thu, 03 Jun 2021 23:15:09 -0000 Result of: git mv -f sysdeps/posix/shm_open.c rt and manual removal of the _POSIX_MAPPED_FILES preprocessor condition. --- rt/shm_open.c | 34 ++++++++++++++++++---- sysdeps/posix/shm_open.c | 62 ---------------------------------------- 2 files changed, 29 insertions(+), 67 deletions(-) delete mode 100644 sysdeps/posix/shm_open.c diff --git a/rt/shm_open.c b/rt/shm_open.c index e2bd25978a..a89aac4102 100644 --- a/rt/shm_open.c +++ b/rt/shm_open.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000-2021 Free Software Foundation, Inc. +/* shm_open -- open a POSIX shared memory object. Generic POSIX file version. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,13 +17,36 @@ . */ #include -#include +#include +#include +#include +#include /* Open shared memory object. */ int shm_open (const char *name, int oflag, mode_t mode) { - __set_errno (ENOSYS); - return -1; + struct shmdir_name dirname; + if (__shm_get_name (&dirname, name, false) != 0) + { + __set_errno (EINVAL); + return -1; + } + + oflag |= O_NOFOLLOW | O_CLOEXEC; + + /* Disable asynchronous cancellation. */ + int state; + pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); + + int fd = open (dirname.name, oflag, mode); + if (fd == -1 && __glibc_unlikely (errno == EISDIR)) + /* It might be better to fold this error with EINVAL since + directory names are just another example for unsuitable shared + object names and the standard does not mention EISDIR. */ + __set_errno (EINVAL); + + pthread_setcancelstate (state, NULL); + + return fd; } -stub_warning (shm_open) diff --git a/sysdeps/posix/shm_open.c b/sysdeps/posix/shm_open.c deleted file mode 100644 index 1817c52f7f..0000000000 --- a/sysdeps/posix/shm_open.c +++ /dev/null @@ -1,62 +0,0 @@ -/* shm_open -- open a POSIX shared memory object. Generic POSIX file version. - Copyright (C) 2001-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include - -#if ! _POSIX_MAPPED_FILES - -# include - -#else - -# include -# include -# include -# include - - -/* Open shared memory object. */ -int -shm_open (const char *name, int oflag, mode_t mode) -{ - struct shmdir_name dirname; - if (__shm_get_name (&dirname, name, false) != 0) - { - __set_errno (EINVAL); - return -1; - } - - oflag |= O_NOFOLLOW | O_CLOEXEC; - - /* Disable asynchronous cancellation. */ - int state; - pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); - - int fd = open (dirname.name, oflag, mode); - if (fd == -1 && __glibc_unlikely (errno == EISDIR)) - /* It might be better to fold this error with EINVAL since - directory names are just another example for unsuitable shared - object names and the standard does not mention EISDIR. */ - __set_errno (EINVAL); - - pthread_setcancelstate (state, NULL); - - return fd; -} - -#endif /* _POSIX_MAPPED_FILES */ -- 2.31.1