Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp6755497rwb; Mon, 12 Dec 2022 06:08:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf7P0wvlKYRRQXOUS/aUVhRx90Z5UZ7OIfFfhwfMPeVgml2qahUWFFGI+S+v2xUoPlUb6LfM X-Received: by 2002:a17:90a:d146:b0:219:3c9a:b1e4 with SMTP id t6-20020a17090ad14600b002193c9ab1e4mr16573335pjw.29.1670854083479; Mon, 12 Dec 2022 06:08:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670854083; cv=none; d=google.com; s=arc-20160816; b=g2WLNFBHmhe7pcSQ3dxXNrHJa+a6izBsiwoYGurjkCjGtT5JxlKxhCj6OHstcr8B/K 3epL/K8wm7ETxPSk4UYwlVGSmiLC1NYdO9hA2rQeiA/i80YdrEcdpSh3i5GpaOu4i+AP 7iHhmXz5GHG/nzxWN0rVbzFyod3ncv4SN4RTlBF9ceEACLuUGjgx464+VS3DXFv3aPPa 9u5YSvYIynzN4bsuaq4hCEIZVweHGj23lqi7rlyYeE6xBWsGKy5TH5Tg16hYoICmo/Mh z4ksHVFqpi4ocOL210VghUT/b92K9m8qzw+wsvuAdfo/XkUwt7yjf0tsuDiH2hkkHT16 THpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=YO2kYVYaVsI4WL0wNv0c6REJ96KHutqDUA15dm5Owww=; b=skBnoCrB3QGV4dBxDRWXx5KqdryZkT69fzbV84/L81QX763P+VYXUQPf38v8Bk79F+ SEU++xrtQW6hDOSgABL0AG45u9Sgs/U1B7Bg0ycNPylPk4hVZiFHhX/gX2EUswM31AM2 cBIyBqx0e+EQDxWsBE60l4BQ/VwS9bzv5T2c74+04x4W5wRGfL7/gFOhXqDOjnrL4AqL +6UPG9rOeo/Imv9lCUDjwUBQ+d/Q1nIVY+/166qaqaB1HiKBd6xuq4l8aW55zK/0sOup Hdn5LobD/M1mLT0Z0V3H8p/7fOTFf6nlBoWrjz7qWq7uk0E/Sv2An8u1Cr2MH7kluBqY IrWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Jc1ZcnjH; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f7-20020a17090a664700b0021995eb1b2bsi9973181pjm.13.2022.12.12.06.07.48; Mon, 12 Dec 2022 06:08:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Jc1ZcnjH; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233303AbiLLN7i (ORCPT + 99 others); Mon, 12 Dec 2022 08:59:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233294AbiLLN7e (ORCPT ); Mon, 12 Dec 2022 08:59:34 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C00BEBE7 for ; Mon, 12 Dec 2022 05:59:33 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5CBBA610A1 for ; Mon, 12 Dec 2022 13:59:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55BB2C433D2; Mon, 12 Dec 2022 13:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1670853572; bh=pqOpTKdrgEc4uz63dhd1qsH2ctmjaEGeywcTSwxnaP4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Jc1ZcnjHk+lzJD7Gjvua/oDFJpc/vwCdiQQW3T4MweHAXc4HJ9Dhs9TeGcj7MY3uq //uW4kuUMXelirz5NXUr7MKm7P+FWqjzkrAPt2OoyxRcqzuQxJTZmw7LqrFXsJiCEj Qg5n7mUVJSIWsfiSIzPh69Tqqf+pTDnRHhEtTPvo= Date: Mon, 12 Dec 2022 14:59:29 +0100 From: Greg KH To: Jeff Layton 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() Message-ID: References: <1670786549-27041-1-git-send-email-dai.ngo@oracle.com> <7f68cb23445820b4a1c12b74dce0954f537ae5e2.camel@kernel.org> <56b0cb4f-dfe9-6892-7fef-1a2965cf1d99@oracle.com> <0ab8efccae708faa092a56c6935c33564814bfed.camel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0ab8efccae708faa092a56c6935c33564814bfed.camel@kernel.org> X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.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 > > > > Signed-off-by: Dai Ngo > > > > --- > > > > 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, ©->c_fh, > > > > - ©->stateid); > > > > + ©->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