[LTP] [PATCH 2/3] fanotify24: print range info for pre-content events

[Jan Kara]

On Wed 19-03-25 20:27:41, Amir Goldstein wrote:
> range info is expected only for pre-content events
> 
> Signed-off-by: Amir Goldstein <amir73il@gmail.com>

Just one nit below. Otherwise feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

> diff --git a/testcases/kernel/syscalls/fanotify/fanotify24.c b/testcases/kernel/syscalls/fanotify/fanotify24.c
> index 539f74137..2d2479b39 100644
> --- a/testcases/kernel/syscalls/fanotify/fanotify24.c
> +++ b/testcases/kernel/syscalls/fanotify/fanotify24.c
> @@ -339,6 +339,7 @@ static void test_fanotify(unsigned int n)
>  	 */
>  	while (test_num < EVENT_SET_MAX && fd_notify != -1) {
>  		struct fanotify_event_metadata *event;
> +		struct fanotify_event_info_range *range;
>  
>  		if (i == len) {
>  			/* Get more events */
> @@ -367,6 +368,7 @@ static void test_fanotify(unsigned int n)
>  			test_num--;
>  
>  		event = (struct fanotify_event_metadata *)&event_buf[i];
> +		range = (struct fanotify_event_info_range *)(event + 1);
>  		/* Permission events cannot be merged, so the event mask
>  		 * reported should exactly match the event mask within the
>  		 * event set.
> @@ -386,6 +388,22 @@ static void test_fanotify(unsigned int n)
>  				(unsigned int)event->pid,
>  				(unsigned int)child_pid,
>  				event->fd);
> +		} else if (event->mask & LTP_PRE_CONTENT_EVENTS) {

You should probably check here that the event->len is sufficiently large to
contain the range info. Otherwise 'range' might point beyond the end of
event and result in odd behavior...

								Honza

> +			if (range->hdr.info_type != FAN_EVENT_INFO_TYPE_RANGE) {
> +				tst_res(TFAIL,
> +					"got event: mask=%llx pid=%u fd=%d "
> +					"(expected range info)",
> +					(unsigned long long)event->mask,
> +					(unsigned int)event->pid,
> +					event->fd);
> +			} else {
> +				tst_res(TPASS,
> +					"got event: mask=%llx pid=%u fd=%d "
> +					"offset=%llu count=%llu",
> +					(unsigned long long)event->mask,
> +					(unsigned int)event->pid, event->fd,
> +					range->offset, range->count);
> +			}
>  		} else {
>  			tst_res(TPASS,
>  				"got event: mask=%llx pid=%u fd=%d",
> -- 
> 2.34.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR