public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Jeff Layton <jlayton@kernel.org>
Cc: dai.ngo@oracle.com, chuck.lever@oracle.com, kolga@netapp.com,
	hdthky0@gmail.com, linux-nfs@vger.kernel.org,
	security@kernel.org
Subject: Re: [PATCH 1/1] NFSD: fix use-after-free in __nfs42_ssc_open()
Date: Mon, 12 Dec 2022 14:59:29 +0100	[thread overview]
Message-ID: <Y5czwRabTFiwah2b@kroah.com> (raw)
In-Reply-To: <0ab8efccae708faa092a56c6935c33564814bfed.camel@kernel.org>

On Mon, Dec 12, 2022 at 08:40:31AM -0500, Jeff Layton wrote:
> On Mon, 2022-12-12 at 05:34 -0800, dai.ngo@oracle.com wrote:
> > On 12/12/22 4:22 AM, Jeff Layton wrote:
> > > On Sun, 2022-12-11 at 11:22 -0800, Dai Ngo wrote:
> > > > Problem caused by source's vfsmount being unmounted but remains
> > > > on the delayed unmount list. This happens when nfs42_ssc_open()
> > > > return errors.
> > > > Fixed by removing nfsd4_interssc_connect(), leave the vfsmount
> > > > for the laundromat to unmount when idle time expires.
> > > > 
> > > > Reported-by: Xingyuan Mo <hdthky0@gmail.com>
> > > > Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
> > > > ---
> > > >   fs/nfsd/nfs4proc.c | 23 +++++++----------------
> > > >   1 file changed, 7 insertions(+), 16 deletions(-)
> > > > 
> > > > diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> > > > index 8beb2bc4c328..756e42cf0d01 100644
> > > > --- a/fs/nfsd/nfs4proc.c
> > > > +++ b/fs/nfsd/nfs4proc.c
> > > > @@ -1463,13 +1463,6 @@ nfsd4_interssc_connect(struct nl4_server *nss, struct svc_rqst *rqstp,
> > > >   	return status;
> > > >   }
> > > >   
> > > > -static void
> > > > -nfsd4_interssc_disconnect(struct vfsmount *ss_mnt)
> > > > -{
> > > > -	nfs_do_sb_deactive(ss_mnt->mnt_sb);
> > > > -	mntput(ss_mnt);
> > > > -}
> > > > -
> > > >   /*
> > > >    * Verify COPY destination stateid.
> > > >    *
> > > > @@ -1572,11 +1565,6 @@ nfsd4_cleanup_inter_ssc(struct vfsmount *ss_mnt, struct file *filp,
> > > >   {
> > > >   }
> > > >   
> > > > -static void
> > > > -nfsd4_interssc_disconnect(struct vfsmount *ss_mnt)
> > > > -{
> > > > -}
> > > > -
> > > >   static struct file *nfs42_ssc_open(struct vfsmount *ss_mnt,
> > > >   				   struct nfs_fh *src_fh,
> > > >   				   nfs4_stateid *stateid)
> > > > @@ -1762,7 +1750,8 @@ static int nfsd4_do_async_copy(void *data)
> > > >   		struct file *filp;
> > > >   
> > > >   		filp = nfs42_ssc_open(copy->ss_mnt, &copy->c_fh,
> > > > -				      &copy->stateid);
> > > > +					&copy->stateid);
> > > > +
> > > >   		if (IS_ERR(filp)) {
> > > >   			switch (PTR_ERR(filp)) {
> > > >   			case -EBADF:
> > > > @@ -1771,7 +1760,7 @@ static int nfsd4_do_async_copy(void *data)
> > > >   			default:
> > > >   				nfserr = nfserr_offload_denied;
> > > >   			}
> > > > -			nfsd4_interssc_disconnect(copy->ss_mnt);
> > > > +			/* ss_mnt will be unmounted by the laundromat */
> > > >   			goto do_callback;
> > > >   		}
> > > >   		nfserr = nfsd4_do_copy(copy, filp, copy->nf_dst->nf_file,
> > > > @@ -1852,8 +1841,10 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> > > >   	if (async_copy)
> > > >   		cleanup_async_copy(async_copy);
> > > >   	status = nfserrno(-ENOMEM);
> > > > -	if (nfsd4_ssc_is_inter(copy))
> > > > -		nfsd4_interssc_disconnect(copy->ss_mnt);
> > > > +	/*
> > > > +	 * source's vfsmount of inter-copy will be unmounted
> > > > +	 * by the laundromat
> > > > +	 */
> > > >   	goto out;
> > > >   }
> > > >   
> > > This looks reasonable at first glance, but I have some concerns with the
> > > refcounting around ss_mnt elsewhere in this code. nfsd4_ssc_setup_dul
> > > looks for an existing connection and bumps the ni->nsui_refcnt if it
> > > finds one.
> > > 
> > > But then later, nfsd4_cleanup_inter_ssc has a couple of cases where it
> > > just does a bare mntput:
> > > 
> > >          if (!nn) {
> > >                  mntput(ss_mnt);
> > >                  return;
> > >          }
> > > ...
> > >          if (!found) {
> > >                  mntput(ss_mnt);
> > >                  return;
> > >          }
> > > 
> > > The first one looks bogus. Can net_generic return NULL? If so how, and
> > > why is it not a problem elsewhere in the kernel?
> > 
> > it looks like net_generic can not fail, no where else check for NULL
> > so I will remove this check.
> > 
> > > 
> > > For the second case, if the ni is no longer on the list, where did the
> > > extra ss_mnt reference come from? Maybe that should be a WARN_ON or
> > > BUG_ON?
> > 
> > if ni is not found on the list then it's a bug somewhere so I will add
> > a BUG_ON on this.
> > 
> 
> Probably better to just WARN_ON and let any references leak in that
> case. A BUG_ON implies a panic in some environments, and it's best to
> avoid that unless there really is no choice.

WARN_ON also causes machines to boot that have panic_on_warn enabled.
Why not just handle the error and keep going?  Why panic at all?

thanks,

greg k-h

  parent reply	other threads:[~2022-12-12 13:59 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-11 19:22 [PATCH 1/1] NFSD: fix use-after-free in __nfs42_ssc_open() Dai Ngo
2022-12-12 11:22 ` Xingyuan Mo
2022-12-12 11:59   ` Greg KH
2022-12-12 12:26     ` Jeff Layton
2022-12-12 12:44       ` Greg KH
2022-12-12 13:44     ` Xingyuan Mo
2022-12-12 12:22 ` Jeff Layton
2022-12-12 13:34   ` dai.ngo
2022-12-12 13:40     ` Jeff Layton
2022-12-12 13:57       ` dai.ngo
2022-12-12 13:59       ` Greg KH [this message]
2022-12-12 14:31         ` Jeff Layton
2022-12-12 17:14           ` Greg KH
2022-12-12 17:44             ` Jeff Layton
2022-12-12 18:16               ` Chuck Lever III
2022-12-12 18:38                 ` Jeff Layton
2022-12-12 19:16                   ` dai.ngo
2022-12-12 19:28                     ` Chuck Lever III
2022-12-12 19:45                       ` dai.ngo
2022-12-12 19:46                       ` Jeff Layton
2022-12-12 19:48                         ` Chuck Lever III
2022-12-12 19:59                           ` dai.ngo
2022-12-12 21:17                             ` Jeff Layton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y5czwRabTFiwah2b@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=chuck.lever@oracle.com \
    --cc=dai.ngo@oracle.com \
    --cc=hdthky0@gmail.com \
    --cc=jlayton@kernel.org \
    --cc=kolga@netapp.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=security@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox