From patchwork Thu Jul 23 19:46:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40168 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 034203840C2F; Thu, 23 Jul 2020 19:47:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 034203840C2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1595533640; bh=ekXoJLfPfupexeZFBIW2+n9uuE1g2lXhOKqu1dV2ss0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=TN5K3uWUryInpCBAtRkgbJ62DEVjvJdI/pfZGIG2812EaulcyV3+SfpWIbo80Hcu7 1oQlQKOnGsbTyygKqZstIiqmBL/gCN2YItybPPB4BNSxvdfsOUClmiey+Hlvi94ZSd UvJqerP87kut71EtjhOnnV3XpufSgjXeRlFolscg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by sourceware.org (Postfix) with ESMTPS id 34EFF3857002 for ; Thu, 23 Jul 2020 19:47:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 34EFF3857002 Received: by mail-qk1-x741.google.com with SMTP id h7so6549847qkk.7 for ; Thu, 23 Jul 2020 12:47:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ekXoJLfPfupexeZFBIW2+n9uuE1g2lXhOKqu1dV2ss0=; b=QYUrPKDx8V37KYRChwvH7lBD/HUvaW/FX//AdHPn+2NR8xTizLhGzYhz8lKyW/Z3gi J7Xdf8hIEk2lytaU5oZrPYYywLy//5lQzGsIhuPDMi8CSGXV5mTrWhOkQgtoEMOH3BKx XzagfVtM1DAWWbXG+s26RRYnP+voUeJI0jmfJZP334InFclFXxoqg7hA7nOPh/WTtNjJ I2mq2Umr52c4FsfGdRVPohA7eD4y+0FO3DwXCDChR5qxBSqd9U7pdOY0jxFQFrmAj1a0 fFfT9XwIDp2cIliLY2Y431bsAOHmA4NdmRtwdK1E1amAUSIAubTFukJrc4H9uCXLpZ8v 4KSA== X-Gm-Message-State: AOAM5308rjP0DxFTGnVfYWX/TIUsBwY9lAye8XGIHy32ymdQYqw3pPT/ 5ahZ9TlhjuLtGa6bvP5+ROgl9alKC4w= X-Google-Smtp-Source: ABdhPJwOVFWN4zNIzGh7nog2gOrAqX5zWCCNMh4blvr05q5EeWrfLlW+OzvXh0udXaoZosmANVXygw== X-Received: by 2002:a37:6447:: with SMTP id y68mr7129342qkb.351.1595533635473; Thu, 23 Jul 2020 12:47:15 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id k56sm3570639qtk.61.2020.07.23.12.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 12:47:15 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 16/16] linux: Move xmknoda{at} to compat symbols Date: Thu, 23 Jul 2020 16:46:41 -0300 Message-Id: <20200723194641.1949404-17-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200723194641.1949404-1-adhemerval.zanella@linaro.org> References: <20200723194641.1949404-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Alistair Francis Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" It also decouple mknod{at} from xmknod{at}. Checked with a build for all affected Linux ABIs. I checked also on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski --- include/sys/stat.h | 6 +++-- sysdeps/mach/hurd/xmknod.c | 1 - sysdeps/mach/hurd/xmknodat.c | 2 -- sysdeps/unix/sysv/linux/mknod.c | 28 ++++++++++++++++++++ sysdeps/unix/sysv/linux/mknodat.c | 41 ++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/xmknod.c | 20 +++++---------- sysdeps/unix/sysv/linux/xmknodat.c | 23 +++++------------ 7 files changed, 86 insertions(+), 35 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/mknod.c create mode 100644 sysdeps/unix/sysv/linux/mknodat.c diff --git a/include/sys/stat.h b/include/sys/stat.h index 87d4a5ec4f..da8b14fee0 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -84,6 +84,8 @@ extern __mode_t __umask (__mode_t __mask); extern int __mkdir (const char *__path, __mode_t __mode); libc_hidden_proto (__mkdir) +extern int __mknodat_common (int fd, const char *, __mode_t, __dev_t *) + attribute_hidden; extern int __mknodat (int fd, const char *path, mode_t mode, dev_t dev); libc_hidden_proto (__mknodat); extern int __mknod (const char *__path, @@ -92,10 +94,8 @@ libc_hidden_proto (__mknod); extern int __xmknod (int __ver, const char *__path, __mode_t __mode, __dev_t *__dev); -libc_hidden_proto (__xmknod) extern int __xmknodat (int __ver, int __fd, const char *__path, __mode_t __mode, __dev_t *__dev); -libc_hidden_proto (__xmknodat) int __fxstat (int __ver, int __fildes, struct stat *__stat_buf); int __xstat (int __ver, const char *__filename, @@ -121,6 +121,8 @@ hidden_proto (__xstat64); hidden_proto (__lxstat64); hidden_proto (__fxstatat64); # endif +libc_hidden_proto (__xmknod) +libc_hidden_proto (__xmknodat) # define stat(fname, buf) __xstat (_STAT_VER, fname, buf) # define lstat(fname, buf) __lxstat (_STAT_VER, fname, buf) # define __lstat(fname, buf) __lxstat (_STAT_VER, fname, buf) diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c index 0ab4f1b719..67e32f518d 100644 --- a/sysdeps/mach/hurd/xmknod.c +++ b/sysdeps/mach/hurd/xmknod.c @@ -30,4 +30,3 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev) { return __xmknodat (vers, AT_FDCWD, file_name, mode, dev); } -libc_hidden_def (__xmknod) diff --git a/sysdeps/mach/hurd/xmknodat.c b/sysdeps/mach/hurd/xmknodat.c index 4239d1ea91..0333765ebc 100644 --- a/sysdeps/mach/hurd/xmknodat.c +++ b/sysdeps/mach/hurd/xmknodat.c @@ -116,5 +116,3 @@ __xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev) return __hurd_fail (err); return 0; } - -libc_hidden_def (__xmknodat) diff --git a/sysdeps/unix/sysv/linux/mknod.c b/sysdeps/unix/sysv/linux/mknod.c new file mode 100644 index 0000000000..3185726f52 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mknod.c @@ -0,0 +1,28 @@ +/* Create a special or ordinary file. Linux version. + Copyright (C) 2020 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 +#include + +int +__mknod (const char *path, mode_t mode, dev_t dev) +{ + return __mknodat_common (AT_FDCWD, path, mode, &dev); +} +libc_hidden_def (__mknod) +weak_alias (__mknod, mknod) diff --git a/sysdeps/unix/sysv/linux/mknodat.c b/sysdeps/unix/sysv/linux/mknodat.c new file mode 100644 index 0000000000..d160fe520b --- /dev/null +++ b/sysdeps/unix/sysv/linux/mknodat.c @@ -0,0 +1,41 @@ +/* Create a special or ordinary file. Linux version. + Copyright (C) 2020 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 +#include +#include + +int +__mknodat_common (int fd, const char *path, mode_t mode, dev_t *dev) +{ + /* We must convert the value to dev_t type used by the kernel. */ + unsigned long long int k_dev = (*dev) & ((1ULL << 32) - 1); + if (k_dev != *dev) + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); + + return INLINE_SYSCALL_CALL (mknodat, fd, path, mode, + (unsigned int) k_dev); +} + +int +__mknodat (int fd, const char *path, mode_t mode, dev_t dev) +{ + return __mknodat_common (fd, path, mode, &dev); +} +libc_hidden_def (__mknodat) +weak_alias (__mknodat, mknodat) diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c index 42809d4c57..2ae384a536 100644 --- a/sysdeps/unix/sysv/linux/xmknod.c +++ b/sysdeps/unix/sysv/linux/xmknod.c @@ -17,29 +17,23 @@ . */ #include -#include #include -#include +#include +#include +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Create a device file named PATH, with permission and special bits MODE and device number DEV (which can be constructed from major and minor device numbers with the `makedev' macro above). */ int +attribute_compat_text_section __xmknod (int vers, const char *path, mode_t mode, dev_t *dev) { - unsigned long long int k_dev; - if (vers != _MKNOD_VER) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - /* We must convert the value to dev_t type used by the kernel. */ - k_dev = (*dev) & ((1ULL << 32) - 1); - if (k_dev != *dev) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - - return INLINE_SYSCALL_CALL (mknodat, AT_FDCWD, path, mode, - (unsigned int) k_dev); + return __mknodat_common (AT_FDCWD, path, mode, dev); } -weak_alias (__xmknod, _xmknod) -libc_hidden_def (__xmknod) +compat_symbol (libc, __xmknod, __xmknod, GLIBC_2_0); +#endif diff --git a/sysdeps/unix/sysv/linux/xmknodat.c b/sysdeps/unix/sysv/linux/xmknodat.c index 5640a499aa..11b52a29b2 100644 --- a/sysdeps/unix/sysv/linux/xmknodat.c +++ b/sysdeps/unix/sysv/linux/xmknodat.c @@ -15,18 +15,11 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include -#include -#include #include -#include - -#include -#include - +#include +#include +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Create a device file named PATH relative to FD, with permission and special bits MODE and device number DEV (which can be constructed from major and minor device numbers with the `makedev' macro above). */ @@ -36,12 +29,8 @@ __xmknodat (int vers, int fd, const char *file, mode_t mode, dev_t *dev) if (vers != _MKNOD_VER) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - /* We must convert the value to dev_t type used by the kernel. */ - unsigned long long int k_dev = (*dev) & ((1ULL << 32) - 1); - if (k_dev != *dev) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - - return INLINE_SYSCALL (mknodat, 4, fd, file, mode, (unsigned int) k_dev); + return __mknodat_common (fd, file, mode, dev); } -libc_hidden_def (__xmknodat) +compat_symbol (libc, __xmknodat, __xmknodat, GLIBC_2_4); +#endif