[PATCH v7 13/28] fanotify: Allow file handle encoding for unhashed events
STALE1811d
REVIEWED: 17 (17M)
From: Gabriel Krisman Bertazi <hidden>
Date: 2021-10-14 21:38:32
Also in:
linux-api, linux-fsdevel
Subsystem:
fanotify, filesystems (vfs and infrastructure), fsnotify: filesystem notification infrastructure, the rest · Maintainers:
Jan Kara, Alexander Viro, Christian Brauner, Linus Torvalds
Revision v7 of 3 in this series; 2 review trailers (2 from subsystem maintainers).
Revisions (3)
- v7 current
- v8 [diff vs current]
- v9 [diff vs current]
Allow passing a NULL hash to fanotify_encode_fh and avoid calculating the hash if not needed. Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Gabriel Krisman Bertazi <redacted> --- fs/notify/fanotify/fanotify.c | 8 ++++++-- 1 file 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;
--
2.33.0