[1/6] linux: Add fanotify_mark C implementation
Checks
| Context |
Check |
Description |
| dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
Passing 64-bit arguments on syscalls.list is tricky: it requires
to reimplement the expected kernel abi in each architecture. This
is way to better to represent in C code where we already have
macros for this (SYSCALL_LL64).
Checked on x86_64-linux-gnu.
---
sysdeps/unix/sysv/linux/Makefile | 3 +-
sysdeps/unix/sysv/linux/arm/syscalls.list | 2 --
sysdeps/unix/sysv/linux/fanotify_mark.c | 36 +++++++++++++++++++
.../linux/generic/wordsize-32/syscalls.list | 1 -
sysdeps/unix/sysv/linux/hppa/fanotify_mark.c | 2 ++
sysdeps/unix/sysv/linux/hppa/syscalls.list | 1 -
sysdeps/unix/sysv/linux/i386/syscalls.list | 2 --
sysdeps/unix/sysv/linux/m68k/syscalls.list | 1 -
.../unix/sysv/linux/microblaze/syscalls.list | 1 -
.../unix/sysv/linux/mips/mips32/syscalls.list | 2 --
.../sysv/linux/mips/mips64/n32/syscalls.list | 2 --
.../sysv/linux/mips/mips64/n64/syscalls.list | 2 --
.../linux/powerpc/powerpc32/syscalls.list | 1 -
.../sysv/linux/s390/s390-32/syscalls.list | 1 -
sysdeps/unix/sysv/linux/sh/fanotify_mark.c | 2 ++
sysdeps/unix/sysv/linux/sh/syscalls.list | 2 --
.../sysv/linux/sparc/sparc32/syscalls.list | 1 -
.../unix/sysv/linux/wordsize-64/syscalls.list | 2 --
18 files changed, 42 insertions(+), 22 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/fanotify_mark.c
create mode 100644 sysdeps/unix/sysv/linux/hppa/fanotify_mark.c
create mode 100644 sysdeps/unix/sysv/linux/sh/fanotify_mark.c
Comments
On Mon, Nov 22, 2021 at 03:54:32PM -0300, Adhemerval Zanella wrote:
> Passing 64-bit arguments on syscalls.list is tricky: it requires
> to reimplement the expected kernel abi in each architecture. This
> is way to better to represent in C code where we already have
> macros for this (SYSCALL_LL64).
>
> Checked on x86_64-linux-gnu.
> ---
> sysdeps/unix/sysv/linux/Makefile | 3 +-
> sysdeps/unix/sysv/linux/arm/syscalls.list | 2 --
> sysdeps/unix/sysv/linux/fanotify_mark.c | 36 +++++++++++++++++++
> .../linux/generic/wordsize-32/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/hppa/fanotify_mark.c | 2 ++
> sysdeps/unix/sysv/linux/hppa/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/i386/syscalls.list | 2 --
> sysdeps/unix/sysv/linux/m68k/syscalls.list | 1 -
> .../unix/sysv/linux/microblaze/syscalls.list | 1 -
> .../unix/sysv/linux/mips/mips32/syscalls.list | 2 --
> .../sysv/linux/mips/mips64/n32/syscalls.list | 2 --
> .../sysv/linux/mips/mips64/n64/syscalls.list | 2 --
> .../linux/powerpc/powerpc32/syscalls.list | 1 -
> .../sysv/linux/s390/s390-32/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/sh/fanotify_mark.c | 2 ++
> sysdeps/unix/sysv/linux/sh/syscalls.list | 2 --
> .../sysv/linux/sparc/sparc32/syscalls.list | 1 -
> .../unix/sysv/linux/wordsize-64/syscalls.list | 2 --
> 18 files changed, 42 insertions(+), 22 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/fanotify_mark.c
> create mode 100644 sysdeps/unix/sysv/linux/hppa/fanotify_mark.c
> create mode 100644 sysdeps/unix/sysv/linux/sh/fanotify_mark.c
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 76ad06361c..c5b4f249cc 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -66,7 +66,8 @@ sysdep_routines += adjtimex clone umount umount2 readahead sysctl \
> fxstatat fxstatat64 \
> xmknod xmknodat convert_scm_timestamps \
> closefrom_fallback \
> - clone3 clone-internal
> + clone3 clone-internal \
> + fanotify_mark \
>
> CFLAGS-gethostid.c = -fexceptions
> CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables
> diff --git a/sysdeps/unix/sysv/linux/arm/syscalls.list b/sysdeps/unix/sysv/linux/arm/syscalls.list
> index 10c3ae9dae..fa26876f90 100644
> --- a/sysdeps/unix/sysv/linux/arm/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/arm/syscalls.list
> @@ -17,8 +17,6 @@ setfsuid - setfsuid32 Ei:i setfsuid
>
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>
> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
> -
> personality EXTRA personality Ei:i __personality personality
>
> # proper socket implementations:
> diff --git a/sysdeps/unix/sysv/linux/fanotify_mark.c b/sysdeps/unix/sysv/linux/fanotify_mark.c
> new file mode 100644
> index 0000000000..6f8fd2e9cf
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/fanotify_mark.c
> @@ -0,0 +1,36 @@
> +/* Add, remove, or modify an fanotify mark on a filesystem object.
> + Linux specific syscall.
> + Copyright (C) 2020 Free Software Foundation, Inc.
2021?
> + 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
> + <https://www.gnu.org/licenses/>. */
> +
> +#include <sys/fanotify.h>
> +#include <sysdep.h>
> +
> +int
> +__fanotify_mark (int fd, unsigned int flags, uint64_t mask, int dirfd,
> + const char *pathname)
> +{
> + return INLINE_SYSCALL_CALL (fanotify_mark, fd, flags, SYSCALL_LL64 (mask),
> + dirfd, pathname);
> +}
> +#ifdef VERSION_fanotify_mark
> +# include <shlib-compat.h>
> +versioned_symbol (libc, __fanotify_mark, fanotify_mark,
> + VERSION_fanotify_mark);
> +#else
> +weak_alias (__fanotify_mark, fanotify_mark)
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list b/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list
> index b775008a37..736edbe654 100644
> --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list
> @@ -2,4 +2,3 @@
>
> # rlimit APIs
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
> diff --git a/sysdeps/unix/sysv/linux/hppa/fanotify_mark.c b/sysdeps/unix/sysv/linux/hppa/fanotify_mark.c
> new file mode 100644
> index 0000000000..ce347a4261
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/hppa/fanotify_mark.c
> @@ -0,0 +1,2 @@
> +#define VERSION_fanotify_mark GLIBC_2_19
> +#include <sysdeps/unix/sysv/linux/fanotify_mark.c>
> diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list
> index 043d884bf9..cc5305a585 100644
> --- a/sysdeps/unix/sysv/linux/hppa/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list
> @@ -10,5 +10,4 @@ socket - socket i:iii __socket socket
> socketpair - socketpair i:iiif __socketpair socketpair
>
> prlimit64 EXTRA prlimit64 i:iipp __prlimit64 prlimit64@@GLIBC_2.17
> -fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.19
> personality EXTRA personality Ei:i __personality personality
> diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list
> index 58020dfae5..d3eaabe61b 100644
> --- a/sysdeps/unix/sysv/linux/i386/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list
> @@ -21,6 +21,4 @@ vm86 - vm86 i:ip __vm86 vm86@@GLIBC_2.3.4
>
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>
> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
> -
> personality EXTRA personality Ei:i __personality personality
> diff --git a/sysdeps/unix/sysv/linux/m68k/syscalls.list b/sysdeps/unix/sysv/linux/m68k/syscalls.list
> index 55a377b841..44c84bf626 100644
> --- a/sysdeps/unix/sysv/linux/m68k/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/m68k/syscalls.list
> @@ -17,5 +17,4 @@ setfsuid - setfsuid32 Ei:i setfsuid
>
> cacheflush EXTRA cacheflush i:iiii __cacheflush cacheflush
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
> personality EXTRA personality Ei:i __personality personality
> diff --git a/sysdeps/unix/sysv/linux/microblaze/syscalls.list b/sysdeps/unix/sysv/linux/microblaze/syscalls.list
> index 932c9cccc8..0abdc38bf3 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/microblaze/syscalls.list
> @@ -3,5 +3,4 @@
> cacheflush EXTRA cacheflush i:iiii __cacheflush cacheflush
>
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
> personality EXTRA personality Ei:i __personality personality
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list
> index f357b5c918..dbeb184d73 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list
> @@ -1,5 +1,3 @@
> # File name Caller Syscall name # args Strong name Weak names
>
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
> -
> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
> index 9e6a584685..848028f125 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
> @@ -6,6 +6,4 @@ lseek64 - lseek i:iii __lseek64 __libc_lseek64 lseek64@@GLIBC_2.2 llseek@GLIBC
>
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>
> -fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
> -
> personality EXTRA personality Ei:i __personality personality
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
> index e4e16dfa49..84f348c8e5 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
> @@ -2,6 +2,4 @@
>
> prlimit EXTRA prlimit64 i:iipp prlimit prlimit64
>
> -fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
> -
> sendfile - sendfile i:iipi sendfile sendfile64
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
> index 966856e64a..d31303250d 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
> @@ -4,4 +4,3 @@ chown - chown i:sii __chown chown@@GLIBC_2.1
> lchown - lchown i:sii __lchown lchown@@GLIBC_2.0 chown@GLIBC_2.0
>
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
> index 300b13dd01..8e9b7c4b71 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
> @@ -16,5 +16,4 @@ setfsgid - setfsgid32 Ei:i setfsgid
> setfsuid - setfsuid32 Ei:i setfsuid
>
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
> personality EXTRA personality Ei:i __personality personality
> diff --git a/sysdeps/unix/sysv/linux/sh/fanotify_mark.c b/sysdeps/unix/sysv/linux/sh/fanotify_mark.c
> new file mode 100644
> index 0000000000..3662f21b60
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/sh/fanotify_mark.c
> @@ -0,0 +1,2 @@
> +#define VERSION_fanotify_mark GLIBC_2_16
> +#include <sysdeps/unix/sysv/linux/fanotify_mark.c>
> diff --git a/sysdeps/unix/sysv/linux/sh/syscalls.list b/sysdeps/unix/sysv/linux/sh/syscalls.list
> index 32badd1ee0..6ff3e8eb8a 100644
> --- a/sysdeps/unix/sysv/linux/sh/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/sh/syscalls.list
> @@ -17,6 +17,4 @@ setfsuid - setfsuid32 Ei:i setfsuid
>
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>
> -fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.16
> -
> personality EXTRA personality Ei:i __personality personality
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
> index 0b6095ffab..4fcae65451 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
> @@ -16,4 +16,3 @@ setfsgid - setfsgid32 Ei:i setfsgid
> setfsuid - setfsuid32 Ei:i setfsuid
>
> prlimit64 EXTRA prlimit64 i:iipp prlimit64
> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
> index 68e3c60536..8d97a32344 100644
> --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
> @@ -2,6 +2,4 @@
>
> sendfile - sendfile i:iipi sendfile sendfile64
> prlimit EXTRA prlimit64 i:iipp prlimit prlimit64
> -
> -fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
> personality EXTRA personality i:i __personality personality
> --
> 2.32.0
Other thank incorrect date nit, this looks ok to me.
-Stafford
On 24/11/2021 18:45, Stafford Horne wrote:
> On Mon, Nov 22, 2021 at 03:54:32PM -0300, Adhemerval Zanella wrote:
>> Passing 64-bit arguments on syscalls.list is tricky: it requires
>> to reimplement the expected kernel abi in each architecture. This
>> is way to better to represent in C code where we already have
>> macros for this (SYSCALL_LL64).
>>
>> Checked on x86_64-linux-gnu.
>> ---
>> sysdeps/unix/sysv/linux/Makefile | 3 +-
>> sysdeps/unix/sysv/linux/arm/syscalls.list | 2 --
>> sysdeps/unix/sysv/linux/fanotify_mark.c | 36 +++++++++++++++++++
>> .../linux/generic/wordsize-32/syscalls.list | 1 -
>> sysdeps/unix/sysv/linux/hppa/fanotify_mark.c | 2 ++
>> sysdeps/unix/sysv/linux/hppa/syscalls.list | 1 -
>> sysdeps/unix/sysv/linux/i386/syscalls.list | 2 --
>> sysdeps/unix/sysv/linux/m68k/syscalls.list | 1 -
>> .../unix/sysv/linux/microblaze/syscalls.list | 1 -
>> .../unix/sysv/linux/mips/mips32/syscalls.list | 2 --
>> .../sysv/linux/mips/mips64/n32/syscalls.list | 2 --
>> .../sysv/linux/mips/mips64/n64/syscalls.list | 2 --
>> .../linux/powerpc/powerpc32/syscalls.list | 1 -
>> .../sysv/linux/s390/s390-32/syscalls.list | 1 -
>> sysdeps/unix/sysv/linux/sh/fanotify_mark.c | 2 ++
>> sysdeps/unix/sysv/linux/sh/syscalls.list | 2 --
>> .../sysv/linux/sparc/sparc32/syscalls.list | 1 -
>> .../unix/sysv/linux/wordsize-64/syscalls.list | 2 --
>> 18 files changed, 42 insertions(+), 22 deletions(-)
>> create mode 100644 sysdeps/unix/sysv/linux/fanotify_mark.c
>> create mode 100644 sysdeps/unix/sysv/linux/hppa/fanotify_mark.c
>> create mode 100644 sysdeps/unix/sysv/linux/sh/fanotify_mark.c
>>
>> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
>> index 76ad06361c..c5b4f249cc 100644
>> --- a/sysdeps/unix/sysv/linux/Makefile
>> +++ b/sysdeps/unix/sysv/linux/Makefile
>> @@ -66,7 +66,8 @@ sysdep_routines += adjtimex clone umount umount2 readahead sysctl \
>> fxstatat fxstatat64 \
>> xmknod xmknodat convert_scm_timestamps \
>> closefrom_fallback \
>> - clone3 clone-internal
>> + clone3 clone-internal \
>> + fanotify_mark \
>>
>> CFLAGS-gethostid.c = -fexceptions
>> CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables
>> diff --git a/sysdeps/unix/sysv/linux/arm/syscalls.list b/sysdeps/unix/sysv/linux/arm/syscalls.list
>> index 10c3ae9dae..fa26876f90 100644
>> --- a/sysdeps/unix/sysv/linux/arm/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/arm/syscalls.list
>> @@ -17,8 +17,6 @@ setfsuid - setfsuid32 Ei:i setfsuid
>>
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>>
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>> -
>> personality EXTRA personality Ei:i __personality personality
>>
>> # proper socket implementations:
>> diff --git a/sysdeps/unix/sysv/linux/fanotify_mark.c b/sysdeps/unix/sysv/linux/fanotify_mark.c
>> new file mode 100644
>> index 0000000000..6f8fd2e9cf
>> --- /dev/null
>> +++ b/sysdeps/unix/sysv/linux/fanotify_mark.c
>> @@ -0,0 +1,36 @@
>> +/* Add, remove, or modify an fanotify mark on a filesystem object.
>> + Linux specific syscall.
>> + Copyright (C) 2020 Free Software Foundation, Inc.
>
> 2021?
Ack (I did a cherry-pick from an old personal branch).
>
>> + 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
>> + <https://www.gnu.org/licenses/>. */
>> +
>> +#include <sys/fanotify.h>
>> +#include <sysdep.h>
>> +
>> +int
>> +__fanotify_mark (int fd, unsigned int flags, uint64_t mask, int dirfd,
>> + const char *pathname)
>> +{
>> + return INLINE_SYSCALL_CALL (fanotify_mark, fd, flags, SYSCALL_LL64 (mask),
>> + dirfd, pathname);
>> +}
>> +#ifdef VERSION_fanotify_mark
>> +# include <shlib-compat.h>
>> +versioned_symbol (libc, __fanotify_mark, fanotify_mark,
>> + VERSION_fanotify_mark);
>> +#else
>> +weak_alias (__fanotify_mark, fanotify_mark)
>> +#endif
>> diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list b/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list
>> index b775008a37..736edbe654 100644
>> --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list
>> @@ -2,4 +2,3 @@
>>
>> # rlimit APIs
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>> diff --git a/sysdeps/unix/sysv/linux/hppa/fanotify_mark.c b/sysdeps/unix/sysv/linux/hppa/fanotify_mark.c
>> new file mode 100644
>> index 0000000000..ce347a4261
>> --- /dev/null
>> +++ b/sysdeps/unix/sysv/linux/hppa/fanotify_mark.c
>> @@ -0,0 +1,2 @@
>> +#define VERSION_fanotify_mark GLIBC_2_19
>> +#include <sysdeps/unix/sysv/linux/fanotify_mark.c>
>> diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list
>> index 043d884bf9..cc5305a585 100644
>> --- a/sysdeps/unix/sysv/linux/hppa/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list
>> @@ -10,5 +10,4 @@ socket - socket i:iii __socket socket
>> socketpair - socketpair i:iiif __socketpair socketpair
>>
>> prlimit64 EXTRA prlimit64 i:iipp __prlimit64 prlimit64@@GLIBC_2.17
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.19
>> personality EXTRA personality Ei:i __personality personality
>> diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list
>> index 58020dfae5..d3eaabe61b 100644
>> --- a/sysdeps/unix/sysv/linux/i386/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list
>> @@ -21,6 +21,4 @@ vm86 - vm86 i:ip __vm86 vm86@@GLIBC_2.3.4
>>
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>>
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>> -
>> personality EXTRA personality Ei:i __personality personality
>> diff --git a/sysdeps/unix/sysv/linux/m68k/syscalls.list b/sysdeps/unix/sysv/linux/m68k/syscalls.list
>> index 55a377b841..44c84bf626 100644
>> --- a/sysdeps/unix/sysv/linux/m68k/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/m68k/syscalls.list
>> @@ -17,5 +17,4 @@ setfsuid - setfsuid32 Ei:i setfsuid
>>
>> cacheflush EXTRA cacheflush i:iiii __cacheflush cacheflush
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>> personality EXTRA personality Ei:i __personality personality
>> diff --git a/sysdeps/unix/sysv/linux/microblaze/syscalls.list b/sysdeps/unix/sysv/linux/microblaze/syscalls.list
>> index 932c9cccc8..0abdc38bf3 100644
>> --- a/sysdeps/unix/sysv/linux/microblaze/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/microblaze/syscalls.list
>> @@ -3,5 +3,4 @@
>> cacheflush EXTRA cacheflush i:iiii __cacheflush cacheflush
>>
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>> personality EXTRA personality Ei:i __personality personality
>> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list
>> index f357b5c918..dbeb184d73 100644
>> --- a/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list
>> @@ -1,5 +1,3 @@
>> # File name Caller Syscall name # args Strong name Weak names
>>
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>> -
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
>> index 9e6a584685..848028f125 100644
>> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
>> @@ -6,6 +6,4 @@ lseek64 - lseek i:iii __lseek64 __libc_lseek64 lseek64@@GLIBC_2.2 llseek@GLIBC
>>
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>>
>> -fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
>> -
>> personality EXTRA personality Ei:i __personality personality
>> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
>> index e4e16dfa49..84f348c8e5 100644
>> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
>> @@ -2,6 +2,4 @@
>>
>> prlimit EXTRA prlimit64 i:iipp prlimit prlimit64
>>
>> -fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
>> -
>> sendfile - sendfile i:iipi sendfile sendfile64
>> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
>> index 966856e64a..d31303250d 100644
>> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
>> @@ -4,4 +4,3 @@ chown - chown i:sii __chown chown@@GLIBC_2.1
>> lchown - lchown i:sii __lchown lchown@@GLIBC_2.0 chown@GLIBC_2.0
>>
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
>> index 300b13dd01..8e9b7c4b71 100644
>> --- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
>> @@ -16,5 +16,4 @@ setfsgid - setfsgid32 Ei:i setfsgid
>> setfsuid - setfsuid32 Ei:i setfsuid
>>
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>> personality EXTRA personality Ei:i __personality personality
>> diff --git a/sysdeps/unix/sysv/linux/sh/fanotify_mark.c b/sysdeps/unix/sysv/linux/sh/fanotify_mark.c
>> new file mode 100644
>> index 0000000000..3662f21b60
>> --- /dev/null
>> +++ b/sysdeps/unix/sysv/linux/sh/fanotify_mark.c
>> @@ -0,0 +1,2 @@
>> +#define VERSION_fanotify_mark GLIBC_2_16
>> +#include <sysdeps/unix/sysv/linux/fanotify_mark.c>
>> diff --git a/sysdeps/unix/sysv/linux/sh/syscalls.list b/sysdeps/unix/sysv/linux/sh/syscalls.list
>> index 32badd1ee0..6ff3e8eb8a 100644
>> --- a/sysdeps/unix/sysv/linux/sh/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/sh/syscalls.list
>> @@ -17,6 +17,4 @@ setfsuid - setfsuid32 Ei:i setfsuid
>>
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>>
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.16
>> -
>> personality EXTRA personality Ei:i __personality personality
>> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
>> index 0b6095ffab..4fcae65451 100644
>> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
>> @@ -16,4 +16,3 @@ setfsgid - setfsgid32 Ei:i setfsgid
>> setfsuid - setfsuid32 Ei:i setfsuid
>>
>> prlimit64 EXTRA prlimit64 i:iipp prlimit64
>> -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
>> index 68e3c60536..8d97a32344 100644
>> --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
>> +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
>> @@ -2,6 +2,4 @@
>>
>> sendfile - sendfile i:iipi sendfile sendfile64
>> prlimit EXTRA prlimit64 i:iipp prlimit prlimit64
>> -
>> -fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
>> personality EXTRA personality i:i __personality personality
>> --
>> 2.32.0
>
> Other thank incorrect date nit, this looks ok to me.
Thanks, I will push it.
@@ -66,7 +66,8 @@ sysdep_routines += adjtimex clone umount umount2 readahead sysctl \
fxstatat fxstatat64 \
xmknod xmknodat convert_scm_timestamps \
closefrom_fallback \
- clone3 clone-internal
+ clone3 clone-internal \
+ fanotify_mark \
CFLAGS-gethostid.c = -fexceptions
CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables
@@ -17,8 +17,6 @@ setfsuid - setfsuid32 Ei:i setfsuid
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
-
personality EXTRA personality Ei:i __personality personality
# proper socket implementations:
new file mode 100644
@@ -0,0 +1,36 @@
+/* Add, remove, or modify an fanotify mark on a filesystem object.
+ Linux specific syscall.
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <sys/fanotify.h>
+#include <sysdep.h>
+
+int
+__fanotify_mark (int fd, unsigned int flags, uint64_t mask, int dirfd,
+ const char *pathname)
+{
+ return INLINE_SYSCALL_CALL (fanotify_mark, fd, flags, SYSCALL_LL64 (mask),
+ dirfd, pathname);
+}
+#ifdef VERSION_fanotify_mark
+# include <shlib-compat.h>
+versioned_symbol (libc, __fanotify_mark, fanotify_mark,
+ VERSION_fanotify_mark);
+#else
+weak_alias (__fanotify_mark, fanotify_mark)
+#endif
@@ -2,4 +2,3 @@
# rlimit APIs
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
new file mode 100644
@@ -0,0 +1,2 @@
+#define VERSION_fanotify_mark GLIBC_2_19
+#include <sysdeps/unix/sysv/linux/fanotify_mark.c>
@@ -10,5 +10,4 @@ socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair
prlimit64 EXTRA prlimit64 i:iipp __prlimit64 prlimit64@@GLIBC_2.17
-fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.19
personality EXTRA personality Ei:i __personality personality
@@ -21,6 +21,4 @@ vm86 - vm86 i:ip __vm86 vm86@@GLIBC_2.3.4
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
-
personality EXTRA personality Ei:i __personality personality
@@ -17,5 +17,4 @@ setfsuid - setfsuid32 Ei:i setfsuid
cacheflush EXTRA cacheflush i:iiii __cacheflush cacheflush
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
personality EXTRA personality Ei:i __personality personality
@@ -3,5 +3,4 @@
cacheflush EXTRA cacheflush i:iiii __cacheflush cacheflush
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
personality EXTRA personality Ei:i __personality personality
@@ -1,5 +1,3 @@
# File name Caller Syscall name # args Strong name Weak names
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-
-fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
@@ -6,6 +6,4 @@ lseek64 - lseek i:iii __lseek64 __libc_lseek64 lseek64@@GLIBC_2.2 llseek@GLIBC
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
-
personality EXTRA personality Ei:i __personality personality
@@ -2,6 +2,4 @@
prlimit EXTRA prlimit64 i:iipp prlimit prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
-
sendfile - sendfile i:iipi sendfile sendfile64
@@ -4,4 +4,3 @@ chown - chown i:sii __chown chown@@GLIBC_2.1
lchown - lchown i:sii __lchown lchown@@GLIBC_2.0 chown@GLIBC_2.0
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
@@ -16,5 +16,4 @@ setfsgid - setfsgid32 Ei:i setfsgid
setfsuid - setfsuid32 Ei:i setfsuid
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
personality EXTRA personality Ei:i __personality personality
new file mode 100644
@@ -0,0 +1,2 @@
+#define VERSION_fanotify_mark GLIBC_2_16
+#include <sysdeps/unix/sysv/linux/fanotify_mark.c>
@@ -17,6 +17,4 @@ setfsuid - setfsuid32 Ei:i setfsuid
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.16
-
personality EXTRA personality Ei:i __personality personality
@@ -16,4 +16,3 @@ setfsgid - setfsgid32 Ei:i setfsgid
setfsuid - setfsuid32 Ei:i setfsuid
prlimit64 EXTRA prlimit64 i:iipp prlimit64
-fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
@@ -2,6 +2,4 @@
sendfile - sendfile i:iipi sendfile sendfile64
prlimit EXTRA prlimit64 i:iipp prlimit prlimit64
-
-fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark
personality EXTRA personality i:i __personality personality