Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 19 Oct 2021 16:08:45 +0200
From:   Jan Kara <jack@suse.cz>
To:     Gabriel Krisman Bertazi <krisman@collabora.com>
Cc:     jack@suse.com, amir73il@gmail.com, djwong@kernel.org,
        tytso@mit.edu, david@fromorbit.com, dhowells@redhat.com,
        khazhy@google.com, linux-fsdevel@vger.kernel.org,
        linux-ext4@vger.kernel.org, linux-api@vger.kernel.org,
        kernel@collabora.com
Subject: Re: [PATCH v8 25/32] fanotify: Report fid entry even for zero-length
 file_handle
Message-ID: <20211019140845.GO3255@quack2.suse.cz>
References: <20211019000015.1666608-1-krisman@collabora.com>
 <20211019000015.1666608-26-krisman@collabora.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211019000015.1666608-26-krisman@collabora.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

On Mon 18-10-21 21:00:08, Gabriel Krisman Bertazi wrote:
> Non-inode errors will reported with an empty file_handle.  In
> preparation for that, allow some events to print the FID record even if
> there isn't any file_handle encoded
> 
> Even though FILEID_ROOT is used internally, make zero-length file
> handles be reported as FILEID_INVALID.
> 
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>

I suppose you need to move fanotify_has_object_fh() change from patch 27
here. Otherwise the change looks good so feel free to add:

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

								Honza

> ---
>  fs/notify/fanotify/fanotify_user.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
> index ae848306a017..cd962deefeb7 100644
> --- a/fs/notify/fanotify/fanotify_user.c
> +++ b/fs/notify/fanotify/fanotify_user.c
> @@ -339,9 +339,6 @@ static int copy_fid_info_to_user(__kernel_fsid_t *fsid, struct fanotify_fh *fh,
>  	pr_debug("%s: fh_len=%zu name_len=%zu, info_len=%zu, count=%zu\n",
>  		 __func__, fh_len, name_len, info_len, count);
>  
> -	if (!fh_len)
> -		return 0;
> -
>  	if (WARN_ON_ONCE(len < sizeof(info) || len > count))
>  		return -EFAULT;
>  
> @@ -376,6 +373,11 @@ static int copy_fid_info_to_user(__kernel_fsid_t *fsid, struct fanotify_fh *fh,
>  
>  	handle.handle_type = fh->type;
>  	handle.handle_bytes = fh_len;
> +
> +	/* Mangle handle_type for bad file_handle */
> +	if (!fh_len)
> +		handle.handle_type = FILEID_INVALID;
> +
>  	if (copy_to_user(buf, &handle, sizeof(handle)))
>  		return -EFAULT;
>  
> -- 
> 2.33.0
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR