lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 220/772] fanotify: fix incorrect fmode_t casts
    Date
    From: Vasily Averin <vvs@openvz.org>

    [ Upstream commit dccd855771b37820b6d976a99729c88259549f85 ]

    Fixes sparce warnings:
    fs/notify/fanotify/fanotify_user.c:267:63: sparse:
    warning: restricted fmode_t degrades to integer
    fs/notify/fanotify/fanotify_user.c:1351:28: sparse:
    warning: restricted fmode_t degrades to integer

    FMODE_NONTIFY have bitwise fmode_t type and requires __force attribute
    for any casts.

    Signed-off-by: Vasily Averin <vvs@openvz.org>
    Reviewed-by: Christian Brauner (Microsoft) <brauner@kernel.org>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Link: https://lore.kernel.org/r/9adfd6ac-1b89-791e-796b-49ada3293985@openvz.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/notify/fanotify/fanotify_user.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
    index f2a1947ec5ee..ead37db01ab5 100644
    --- a/fs/notify/fanotify/fanotify_user.c
    +++ b/fs/notify/fanotify/fanotify_user.c
    @@ -264,7 +264,7 @@ static int create_fd(struct fsnotify_group *group, struct path *path,
    * originally opened O_WRONLY.
    */
    new_file = dentry_open(path,
    - group->fanotify_data.f_flags | FMODE_NONOTIFY,
    + group->fanotify_data.f_flags | __FMODE_NONOTIFY,
    current_cred());
    if (IS_ERR(new_file)) {
    /*
    @@ -1329,7 +1329,7 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
    (!(fid_mode & FAN_REPORT_NAME) || !(fid_mode & FAN_REPORT_FID)))
    return -EINVAL;

    - f_flags = O_RDWR | FMODE_NONOTIFY;
    + f_flags = O_RDWR | __FMODE_NONOTIFY;
    if (flags & FAN_CLOEXEC)
    f_flags |= O_CLOEXEC;
    if (flags & FAN_NONBLOCK)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 22:54    [W:4.046 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site