diff options
| author | Gabriel Krisman Bertazi <krisman@collabora.com> | 2021-10-25 21:27:29 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2021-10-27 12:34:31 +0200 |
| commit | 74fe4734897a2da2ae2a665a5e622cd490d36eaf (patch) | |
| tree | 102187017721e7412ccb921d51868e32932828a1 /fs/notify/fanotify | |
| parent | fanotify: Support null inode event in fanotify_dfid_inode (diff) | |
| download | linux-74fe4734897a2da2ae2a665a5e622cd490d36eaf.tar.xz linux-74fe4734897a2da2ae2a665a5e622cd490d36eaf.zip | |
fanotify: Allow file handle encoding for unhashed events
Allow passing a NULL hash to fanotify_encode_fh and avoid calculating
the hash if not needed.
Link: https://lore.kernel.org/r/20211025192746.66445-15-krisman@collabora.com
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify/fanotify')
| -rw-r--r-- | fs/notify/fanotify/fanotify.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 397ee623ff1e..ec84fee7ad01 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -403,8 +403,12 @@ static int fanotify_encode_fh(struct fanotify_fh *fh, struct inode *inode, fh->type = type; fh->len = fh_len; - /* Mix fh into event merge key */ - *hash ^= fanotify_hash_fh(fh); + /* + * Mix fh into event merge key. Hash might be NULL in case of + * unhashed FID events (i.e. FAN_FS_ERROR). + */ + if (hash) + *hash ^= fanotify_hash_fh(fh); return FANOTIFY_FH_HDR_LEN + fh_len; |