Received-SPF: pass (google.com: domain of linux-kernel+bounces-14436-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Tue, 2 Jan 2024 14:47:51 +0100
From: Jan Kara <jack@suse.cz>
To: Amir Goldstein <amir73il@gmail.com>
Cc: Su Hui <suhui@nfschina.com>, jack@suse.cz, repnop@google.com,
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
	kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] fanotify: avoid possible NULL dereference
Message-ID: <20240102134751.2flliwe4lfvp3r5a@quack3>
References: <20230808091849.505809-1-suhui@nfschina.com>
 <CAOQ4uxhtZSr-kq3G1vmm4=GyBO3E5RdSbGSp108moRiRBx4vvg@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAOQ4uxhtZSr-kq3G1vmm4=GyBO3E5RdSbGSp108moRiRBx4vvg@mail.gmail.com>

On Thu 10-08-23 20:58:16, Amir Goldstein wrote:
> On Tue, Aug 8, 2023 at 12:19 PM Su Hui <suhui@nfschina.com> wrote:
> >
> > smatch error:
> > fs/notify/fanotify/fanotify_user.c:462 copy_fid_info_to_user():
> > we previously assumed 'fh' could be null (see line 421)
> >
> > Fixes: afc894c784c8 ("fanotify: Store fanotify handles differently")
> > Signed-off-by: Su Hui <suhui@nfschina.com>'
> 
> Reviewed-by: Amir Goldstein <amir73il@gmail.com>

I'm sorry but this has somehow fallen through the cracks. 

> > diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
> > index f69c451018e3..5a5487ae2460 100644
> > --- a/fs/notify/fanotify/fanotify_user.c
> > +++ b/fs/notify/fanotify/fanotify_user.c
> > @@ -459,12 +459,13 @@ static int copy_fid_info_to_user(__kernel_fsid_t *fsid, struct fanotify_fh *fh,
> >         if (WARN_ON_ONCE(len < sizeof(handle)))
> >                 return -EFAULT;
> >
> > -       handle.handle_type = fh->type;
> >         handle.handle_bytes = fh_len;

Well, if passed 'fh' is NULL, we have problems later in the function
anyway. E.g. in fanotify_fh_buf() a few lines below. So I think this needs
a bit more work that just this small fixup...

								Honza

> >
> >         /* Mangle handle_type for bad file_handle */
> >         if (!fh_len)
> >                 handle.handle_type = FILEID_INVALID;
> > +       else
> > +               handle.handle_type = fh->type;
> >
> >         if (copy_to_user(buf, &handle, sizeof(handle)))
> >                 return -EFAULT;
> > --
> > 2.30.2
> >
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR