pkeys: Fix uclibc build caused by conflicting signature
PATCH 1/1 pkeys: Fix uclibc build caused by conflicting signature
Removing static fixes the problem.
uClibc defines pkey_{alloc,free,mprotect} signatures in <bits/mman-shared.h>, which is included by <bits/mman-linux.h>. Because it does not implement them, our implementation signature conflicts, as it uses static.
Fixed build error:
In file included from pkey01.c:32:0:
pkey.h:18:19: error: static declaration of ?pkey_mprotect? follows non-static declaration
static inline int pkey_mprotect(void *addr, size_t len, int prot, int pkey)
^
In file included from /opt/br-test-pkg/br-arm-full/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/bits/mman-linux.h:115:0,
from /opt/br-test-pkg/br-arm-full/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/bits/mman.h:40,
from /opt/br-test-pkg/br-arm-full/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/mman.h:41,
from pkey01.c:29:
/opt/br-test-pkg/br-arm-full/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/bits/mman-shared.h:73:5: note: previous declaration of ?pkey_mprotect? was here
int pkey_mprotect (void *__addr, size_t __len, int __prot, int __pkey) __THROW;
^In file included from pkey01.c:32:0:
Found with test-pkg tool from Buildroot distribution.
--- testcases/kernel/syscalls/pkeys/pkey.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
testcases/kernel/syscalls/pkeys/pkey.h +3 -3
@@ -15,17 +15,17 @@#endif #ifndef HAVE_PKEY_MPROTECT -static inline int pkey_mprotect (void *addr,size_t len,int prot,int pkey) +inline int pkey_mprotect (void *addr,size_t len,int prot,int pkey) {return tst_syscall (__NR_pkey_mprotect, addr, len, prot, pkey); } -static inline int pkey_alloc (unsigned int flags,unsigned int access_rights) +inline int pkey_alloc (unsigned int flags,unsigned int access_rights) {return tst_syscall (__NR_pkey_alloc, flags, access_rights); } -static inline int pkey_free (int pkey) +inline int pkey_free (int pkey) {return tst_syscall (__NR_pkey_free, pkey); }
Signature · 1 line
2.23.0
PATCH 1/1 pkeys: Fix uclibc build caused by conflicting signature
----- Original Message -----
Quoted 1 line
Removing static fixes the problem.
I'd prefer we rename test functions:
#ifndef HAVE_PKEY_MPROTECT
static inline int my_pkey_alloc()
#else
#define my_pkey_alloc pkey_alloc
#endif
my_pkey_alloc()
Quoted 68 lines
uClibc defines pkey_{alloc,free,mprotect} signatures in <
bits/mman-shared.h>, which is included by <bits/mman-linux.h>. Because it does not implement them, our implementation signature conflicts, as it uses static.Fixed build error:
In file included from pkey01.c:32:0:
pkey.h:18:19: error: static declaration of ?pkey_mprotect? follows non-static declaration
static inline intpkey_mprotect(void *addr, size_t len, int prot, int pkey)^ In file included from /opt/br-test-pkg/br-arm-full/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/bits/mman-linux.h:115:0, from /opt/br-test-pkg/br-arm-full/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/bits/mman.h:40, from /opt/br-test-pkg/br-arm-full/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/mman.h:41, from pkey01.c:29: /opt/br-test-pkg/br-arm-full/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/bits/mman-shared.h:73:5: note: previous declaration of ?pkey_mprotect? was here int pkey_mprotect (void *__addr, size_t __len, int __prot, int __pkey) __THROW; ^In file included from pkey01.c:32:0:
Found with test-pkg tool from Buildroot distribution.
Fixes 90c2dc89f ("pkey: add test for memory protection keys")Signed-off-by Petr Vorel <[email protected]>--- testcases/kernel/syscalls/pkeys/pkey.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)testcases/kernel/syscalls/pkeys/pkey.h +3
-4@@ -15,17 +15,17 @@#endif #ifndef HAVE_PKEY_MPROTECT -static inline int pkey_mprotect (void *addr,size_t len,int prot,int pkey) +inline int pkey_mprotect (void *addr,size_t len,int prot,int pkey) {return tst_syscall (__NR_pkey_mprotect, addr, len, prot, pkey); } -static inline int pkey_alloc (unsigned int flags,unsigned int access_rights) +inline int pkey_alloc (unsigned int flags,unsigned int access_rights) {return tst_syscall (__NR_pkey_alloc, flags, access_rights); } -static inline int pkey_free (int pkey) +inline int pkey_free (int pkey) {return tst_syscall (__NR_pkey_free, pkey); } --2.23.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 1/1 pkeys: Fix uclibc build caused by conflicting signature
Hi Jan,
Quoted 5 lines
----- Original Message -----
Quoted 1 line
Removing static fixes the problem.
I'd prefer we rename test functions:
Quoted 7 lines
#ifndef
HAVE_PKEY_MPROTECT
static inline intmy_pkey_alloc()
#else
#definemy_pkey_allocpkey_alloc
#endif
my_pkey_alloc()
Good idea, thanks. I'd a detail, I'd prefer to use 'ltp_' prefix (ltp_pkey_alloc()).
Kind regards,
Petr