selftests: openat2: fix build error on newer glibc
authorAleksa Sarai <cyphar@cyphar.com>
Thu, 13 Feb 2020 07:26:56 +0000 (18:26 +1100)
committerShuah Khan <skhan@linuxfoundation.org>
Thu, 13 Feb 2020 20:15:45 +0000 (13:15 -0700)
It appears that newer glibcs check that openat(O_CREAT) was provided a
fourth argument (rather than passing garbage), resulting in the
following build error:

> In file included from /usr/include/fcntl.h:301,
>                  from helpers.c:9:
> In function 'openat',
>     inlined from 'touchat' at helpers.c:49:11:
> /usr/include/x86_64-linux-gnu/bits/fcntl2.h:126:4: error: call to
> '__openat_missing_mode' declared with attribute error: openat with O_CREAT
> or O_TMPFILE in third argument needs 4 arguments
>   126 |    __openat_missing_mode ();
>       |    ^~~~~~~~~~~~~~~~~~~~~~~~

Reported-by: Shuah Khan <shuah@kernel.org>
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
Tested-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
tools/testing/selftests/openat2/helpers.c

index e9a6557ab16f3b347d98d84d80d008f2488c7bdd..5074681ffdc995dbe3cc903550ef63f3385ba25a 100644 (file)
@@ -46,7 +46,7 @@ int sys_renameat2(int olddirfd, const char *oldpath,
 
 int touchat(int dfd, const char *path)
 {
-       int fd = openat(dfd, path, O_CREAT);
+       int fd = openat(dfd, path, O_CREAT, 0700);
        if (fd >= 0)
                close(fd);
        return fd;