linux-ext4 - Re: [PATCH v8 24/32] fanotify: Add helpers to decide whether to report FID/DFID

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20211019140314.GM3255@quack2.suse.cz>
Date:   Tue, 19 Oct 2021 16:03:14 +0200
From:   Jan Kara <jack@...e.cz>
To:     Gabriel Krisman Bertazi <krisman@...labora.com>
Cc:     jack@...e.com, amir73il@...il.com, djwong@...nel.org,
        tytso@....edu, david@...morbit.com, dhowells@...hat.com,
        khazhy@...gle.com, linux-fsdevel@...r.kernel.org,
        linux-ext4@...r.kernel.org, linux-api@...r.kernel.org,
        kernel@...labora.com
Subject: Re: [PATCH v8 24/32] fanotify: Add helpers to decide whether to
 report FID/DFID

On Mon 18-10-21 21:00:07, Gabriel Krisman Bertazi wrote:
> Now that there is an event that reports FID records even for a zeroed
> file handle, wrap the logic that deides whether to issue the records
				    ^^^^ decides

> into helper functions.  This shouldn't have any impact on the code, but
> simplifies further patches.
> 
> Signed-off-by: Gabriel Krisman Bertazi <krisman@...labora.com>

Looks good to me but I agree with Amir there's no need to explicit true /
false returns when checking just a simple condition.

Feel free to add:

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

								Honza


> ---
>  fs/notify/fanotify/fanotify.h      | 13 +++++++++++++
>  fs/notify/fanotify/fanotify_user.c | 13 +++++++------
>  2 files changed, 20 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h
> index a5e81d759f65..bdf01ad4f9bf 100644
> --- a/fs/notify/fanotify/fanotify.h
> +++ b/fs/notify/fanotify/fanotify.h
> @@ -265,6 +265,19 @@ static inline int fanotify_event_dir_fh_len(struct fanotify_event *event)
>  	return info ? fanotify_info_dir_fh_len(info) : 0;
>  }
>  
> +static inline bool fanotify_event_has_object_fh(struct fanotify_event *event)
> +{
> +	if (fanotify_event_object_fh_len(event) > 0)
> +		return true;
> +
> +	return false;
> +}
> +
> +static inline bool fanotify_event_has_dir_fh(struct fanotify_event *event)
> +{
> +	return (fanotify_event_dir_fh_len(event) > 0) ? true : false;
> +}
> +
>  struct fanotify_path_event {
>  	struct fanotify_event fae;
>  	struct path path;
> diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
> index a860c286e885..ae848306a017 100644
> --- a/fs/notify/fanotify/fanotify_user.c
> +++ b/fs/notify/fanotify/fanotify_user.c
> @@ -140,10 +140,9 @@ static size_t fanotify_event_len(unsigned int info_mode,
>  		return event_len;
>  
>  	info = fanotify_event_info(event);
> -	dir_fh_len = fanotify_event_dir_fh_len(event);
> -	fh_len = fanotify_event_object_fh_len(event);
>  
> -	if (dir_fh_len) {
> +	if (fanotify_event_has_dir_fh(event)) {
> +		dir_fh_len = fanotify_event_dir_fh_len(event);
>  		event_len += fanotify_fid_info_len(dir_fh_len, info->name_len);
>  	} else if ((info_mode & FAN_REPORT_NAME) &&
>  		   (event->mask & FAN_ONDIR)) {
> @@ -157,8 +156,10 @@ static size_t fanotify_event_len(unsigned int info_mode,
>  	if (info_mode & FAN_REPORT_PIDFD)
>  		event_len += FANOTIFY_PIDFD_INFO_HDR_LEN;
>  
> -	if (fh_len)
> +	if (fanotify_event_has_object_fh(event)) {
> +		fh_len = fanotify_event_object_fh_len(event);
>  		event_len += fanotify_fid_info_len(fh_len, dot_len);
> +	}
>  
>  	return event_len;
>  }
> @@ -451,7 +452,7 @@ static int copy_info_records_to_user(struct fanotify_event *event,
>  	/*
>  	 * Event info records order is as follows: dir fid + name, child fid.
>  	 */
> -	if (fanotify_event_dir_fh_len(event)) {
> +	if (fanotify_event_has_dir_fh(event)) {
>  		info_type = info->name_len ? FAN_EVENT_INFO_TYPE_DFID_NAME :
>  					     FAN_EVENT_INFO_TYPE_DFID;
>  		ret = copy_fid_info_to_user(fanotify_event_fsid(event),
> @@ -467,7 +468,7 @@ static int copy_info_records_to_user(struct fanotify_event *event,
>  		total_bytes += ret;
>  	}
>  
> -	if (fanotify_event_object_fh_len(event)) {
> +	if (fanotify_event_has_object_fh(event)) {
>  		const char *dot = NULL;
>  		int dot_len = 0;
>  
> -- 
> 2.33.0
> 
-- 
Jan Kara <jack@...e.com>
SUSE Labs, CR