From: Rich Felker <dalias@libc.org>
To: Tony Ambardar <tony.ambardar@gmail.com>
Cc: musl@lists.openwall.com
Subject: Re: [musl] [PATCH v2] add renameat2 linux syscall wrapper
Date: Mon, 6 May 2024 10:50:57 -0400 [thread overview]
Message-ID: <20240506145056.GG10433@brightrain.aerifal.cx> (raw)
In-Reply-To: <20240423234355.2414567-1-Tony.Ambardar@gmail.com>
On Tue, Apr 23, 2024 at 04:43:55PM -0700, Tony Ambardar wrote:
> This syscall is available since Linux 3.15 and also implemented in glibc
> from version 2.28. It is commonly used in filesystem or security contexts.
>
> Constants RENAME_NOREPLACE, RENAME_EXCHANGE, RENAME_WHITEOUT are guarded by
> _GNU_SOURCE as with glibc.
>
> Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
> ---
> v1 -> v2:
> * align related constants
> * drop 'int' from 'unsigned int'
> * add fallback to SYS_renameat where applicable
> ---
> include/stdio.h | 7 +++++++
> src/linux/renameat2.c | 12 ++++++++++++
> 2 files changed, 19 insertions(+)
> create mode 100644 src/linux/renameat2.c
>
> diff --git a/include/stdio.h b/include/stdio.h
> index cb858618..4ea4c170 100644
> --- a/include/stdio.h
> +++ b/include/stdio.h
> @@ -158,6 +158,13 @@ char *ctermid(char *);
> #define L_ctermid 20
> #endif
>
> +#if defined(_GNU_SOURCE)
> +#define RENAME_NOREPLACE (1 << 0)
> +#define RENAME_EXCHANGE (1 << 1)
> +#define RENAME_WHITEOUT (1 << 2)
> +
> +int renameat2(int, const char *, int, const char *, unsigned);
> +#endif
>
> #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
> || defined(_BSD_SOURCE)
> diff --git a/src/linux/renameat2.c b/src/linux/renameat2.c
> new file mode 100644
> index 00000000..48ee8d53
> --- /dev/null
> +++ b/src/linux/renameat2.c
> @@ -0,0 +1,12 @@
> +#define _GNU_SOURCE
> +#include <stdio.h>
> +#include "syscall.h"
> +
> +int renameat2(int oldfd, const char *old, int newfd, const char *new, unsigned flags)
> +{
> + int r = __syscall(SYS_renameat2, oldfd, old, newfd, new, flags);
> +#ifdef SYS_renameat
> + if (r==-ENOSYS && !flags) r = __syscall(SYS_renameat, oldfd, old, newfd, new);
> +#endif
> + return __syscall_ret(r);
> +}
> --
> 2.34.1
If flags is 0, the SYS_renameat syscall is semantically equivalent to
the SYS_renameat2 one, so it would be better to just unconditionally
do that first rather than failing and falling back.
Rich
next prev parent reply other threads:[~2024-05-06 14:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-21 15:36 [musl] [PATCH v1] " Tony Ambardar
2024-04-22 22:47 ` Rich Felker
2024-04-23 4:39 ` Tony Ambardar
2024-04-23 15:51 ` Rich Felker
2024-04-23 14:49 ` enh
2024-04-23 15:48 ` Rich Felker
2024-04-23 23:43 ` [musl] [PATCH v2] " Tony Ambardar
2024-05-06 14:50 ` Rich Felker [this message]
2024-05-06 23:42 ` Tony Ambardar
2024-05-07 0:01 ` Rich Felker
2024-05-07 3:28 ` [musl] [PATCH v3] " Tony Ambardar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240506145056.GG10433@brightrain.aerifal.cx \
--to=dalias@libc.org \
--cc=musl@lists.openwall.com \
--cc=tony.ambardar@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).