Re: [PATCH v2 3/3] fanotify: copy full qstr length for copied event names

From: Amir Goldstein

Date: Tue Nov 17 2026 - 09:33:55 EST


On Tue, Nov 17, 2026 at 2:52 PM Junyoung Jang <graypanda.inzag@xxxxxxxxx> wrote:
>
> fanotify_alloc_name_event() reserves name->len + 1 bytes for each
> copied name in a kvmalloc() event. fanotify_info_copy_name() and
> fanotify_info_copy_name2() use strscpy(), which stops at an embedded NUL
> and leaves the remaining name bytes uninitialized. With the original
> length stored in info->name_len or info->name2_len,
> copy_fid_info_to_user() copies name_len + 1 bytes to userspace, leaking
> uninitialized kernel heap memory.
>
> Use memcpy() for the full qstr length and write the terminator
> separately, consistent with __d_alloc() and d_path().
>
> Fixes: 929943b38daf ("fanotify: add support for FAN_REPORT_NAME")
> Cc: stable@xxxxxxxxxxxxxxx
> Co-developed-by: Gwanhyun Lee <gwanhyunlee@xxxxxxxxx>
> Signed-off-by: Gwanhyun Lee <gwanhyunlee@xxxxxxxxx>
> Signed-off-by: Junyoung Jang <graypanda.inzag@xxxxxxxxx>

Reviewed-by: Amir Goldstein <amir73il@xxxxxxxxx>

> ---
> Changes in v2:
> - Use memcpy() for both copied names, as suggested by Amir Goldstein.
> - Write each terminator explicitly without reading past the source qstr.
>
> FUSE fanotify mark setup on a zero-fsid mount returned -ENODEV; the
> normal-name FAN_REPORT_DFID_NAME and FAN_RENAME paths were tested on tmpfs.
>
> fs/notify/fanotify/fanotify.h | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h
> index c25cf5c1fc70..2d6b5c2c6f25 100644
> --- a/fs/notify/fanotify/fanotify.h
> +++ b/fs/notify/fanotify/fanotify.h
> @@ -221,18 +221,26 @@ static inline void fanotify_info_set_file_fh(struct fanotify_info *info,
> static inline void fanotify_info_copy_name(struct fanotify_info *info,
> const struct qstr *name)
> {
> + char *dst;
> +
> if (WARN_ON_ONCE(info->name2_len > 0))
> return;
>
> info->name_len = name->len;
> - strscpy(fanotify_info_name(info), name->name, name->len + 1);
> + dst = fanotify_info_name(info);
> + memcpy(dst, name->name, name->len);
> + dst[name->len] = '\0';
> }
>
> static inline void fanotify_info_copy_name2(struct fanotify_info *info,
> const struct qstr *name)
> {
> + char *dst;
> +
> info->name2_len = name->len;
> - strscpy(fanotify_info_name2(info), name->name, name->len + 1);
> + dst = fanotify_info_name2(info);
> + memcpy(dst, name->name, name->len);
> + dst[name->len] = '\0';
> }
>
> /*