[1/1] fanotify: Fix for musl
diff mbox series

Message ID 20191116002003.13013-1-petr.vorel@gmail.com
State Accepted
Delegated to: Petr Vorel
Headers show
Series
  • [1/1] fanotify: Fix for musl
Related show

Commit Message

Petr Vorel Nov. 16, 2019, 12:20 a.m. UTC
FSID_VAL_MEMBER() wrapper was meant to be only for struct
fanotify_event_info_fid, it was used also for struct event_t
(which has also __kernel_fsid_t fsid, but shouldn't be redefined).

This caused error on recent musl v1.1.23 (with f67b3c17),
which has struct fanotify_event_info_fid.

Fixes: 0498fc0a8 ("fanotify: Detect val vs. __val
fanotify_event_info_fid.fsid member")

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Hi,

I'm sorry, one more error sneaked in.
I accidentally tested it on toolchains which has older musl release.

Helper should have obvious name to show it's just for fanotify_event_info_fid,
but something like EVENT_INFO_FID_FSID_VAL_MEMBER() is too long.
Posting just in case you prefer renaming (fanotify.h is getting a bit
complicated).

NOTE: I also find in various uclibc arch dependent kernel_types.h headers
libc/sysdeps/linux/x86_64/bits/kernel_types.h (19 of 29 archs)
typedef struct {
#ifdef __USE_ALL
	int val[2];
#else
	int __val[2];
#endif
} __kernel_fsid_t;

which would suggest we need also detection and helper for general
__kernel_fsid_t usage. But I'd ignore it unless anybody reports it's
really needed. I haven't found whether __USE_ALL is set as default, but
I expect it so.

Kind regards,
Petr

 testcases/kernel/syscalls/fanotify/fanotify.h   | 1 +
 testcases/kernel/syscalls/fanotify/fanotify13.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Jan Stancek Nov. 16, 2019, 5:22 p.m. UTC | #1
----- Original Message -----
> FSID_VAL_MEMBER() wrapper was meant to be only for struct
> fanotify_event_info_fid, it was used also for struct event_t
> (which has also __kernel_fsid_t fsid, but shouldn't be redefined).
> 
> This caused error on recent musl v1.1.23 (with f67b3c17),
> which has struct fanotify_event_info_fid.
> 
> Fixes: 0498fc0a8 ("fanotify: Detect val vs. __val
> fanotify_event_info_fid.fsid member")
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>

If it's needed for __kernel_fsid_t we'll need to come up with better names.
This basically reverts part of previous patch, which looks ok to me.

Acked-by: Jan Stancek <jstancek@redhat.com>
Petr Vorel Nov. 17, 2019, 10:04 a.m. UTC | #2
Hi Jan,

> ----- Original Message -----
> > FSID_VAL_MEMBER() wrapper was meant to be only for struct
> > fanotify_event_info_fid, it was used also for struct event_t
> > (which has also __kernel_fsid_t fsid, but shouldn't be redefined).

> > This caused error on recent musl v1.1.23 (with f67b3c17),
> > which has struct fanotify_event_info_fid.

> > Fixes: 0498fc0a8 ("fanotify: Detect val vs. __val
> > fanotify_event_info_fid.fsid member")

> > Signed-off-by: Petr Vorel <petr.vorel@gmail.com>

> If it's needed for __kernel_fsid_t we'll need to come up with better names.
+1. But hope this is not needed.

> This basically reverts part of previous patch, which looks ok to me.
Yep. I'll add this to commit message, to be obvious.

> Acked-by: Jan Stancek <jstancek@redhat.com>

Thanks for your review.
I'll wait with merge till Monday (if Cyril has some comments).

Kind regards,
Petr
Petr Vorel Nov. 18, 2019, 8:33 p.m. UTC | #3
Hi,

> > If it's needed for __kernel_fsid_t we'll need to come up with better names.
> +1. But hope this is not needed.

> > This basically reverts part of previous patch, which looks ok to me.
> Yep. I'll add this to commit message, to be obvious.

> > Acked-by: Jan Stancek <jstancek@redhat.com>

> Thanks for your review.
> I'll wait with merge till Monday (if Cyril has some comments).

Merged.

Kind regards,
Petr

Patch
diff mbox series

diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h
index 5370e30bb..9c98aaa1d 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify.h
+++ b/testcases/kernel/syscalls/fanotify/fanotify.h
@@ -143,6 +143,7 @@  struct fanotify_event_info_fid {
 };
 #endif /* HAVE_STRUCT_FANOTIFY_EVENT_INFO_FID */
 
+/* NOTE: only for struct fanotify_event_info_fid */
 #ifdef HAVE_STRUCT_FANOTIFY_EVENT_INFO_FID_FSID___VAL
 # define FSID_VAL_MEMBER(fsid, i) (fsid.__val[i])
 #else
diff --git a/testcases/kernel/syscalls/fanotify/fanotify13.c b/testcases/kernel/syscalls/fanotify/fanotify13.c
index 26212ab62..3d8de6009 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify13.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify13.c
@@ -130,8 +130,8 @@  static int setup_marks(unsigned int fd, struct test_case_t *tc)
 					"kernel");
 				return 1;
 			} else if (errno == ENODEV &&
-					!FSID_VAL_MEMBER(event_set[i].fsid, 0) &&
-					!FSID_VAL_MEMBER(event_set[i].fsid, 1)) {
+					!event_set[i].fsid.val[0] &&
+					!event_set[i].fsid.val[1]) {
 				tst_res(TCONF,
 					"FAN_REPORT_FID not supported on "
 					"filesystem type %s",