From patchwork Wed May 17 16:26:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 95430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1278418vqo; Wed, 17 May 2023 09:50:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ48RvV3p14JqNlV4UKOS1EAkXp8bYQQhSNYTkaM1aXGs3t1NoHq/nqDBxHmF+kP2n3z/a2K X-Received: by 2002:a05:6a00:21c2:b0:647:d698:56d2 with SMTP id t2-20020a056a0021c200b00647d69856d2mr262954pfj.27.1684342234908; Wed, 17 May 2023 09:50:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684342234; cv=none; d=google.com; s=arc-20160816; b=yDd6ngAdRJqhO5Xzr/qw+1OQ4LI2TzuHL+O/2emWiDVZuG/pcLaPLyaVxfOo80qUUu gzabA/PG4ZO3jZy5tmk79j8yn/sOztO1BT6lMQV3z7a8bNAxwDv9ntcNbbCJAdc/AkAm HotDtlhQexNZUR/Tb80R5McSWMjMfxFbVPPxJRZnNm6nMm0kyO7mRUMmW6bT3kqxcGJ1 CfGlbzV/C7Ud3oeKt9ZmWlmAIIE5NC14nagPTEDwbIawotgDyCQcJBFKNyTX7n0DCImp Fy27RNrlWgZq2MZRW+IPNISvkRtNQcTZtoL9E9gORMqhfLm09hmUAai5lKcgr0b/TEN8 quwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=V6ve4mbMhTVqlY5aA6uqD1clj3nrbbL1ZD0I7vrJbmc=; b=ujV+UaZE7nUJLWr5ZWBlVwtzcy8atNj5+fIQoagRkgmw8154ebjHHgjmKq8av9CMoj PjrWOJ0XL/DzI3FaBOHv286wJVa0aRyRK4fD/faeOu+lugC7OG2aXmAsWZQO8BnhP3Dw ImJyDTjq7F5Z3bs3Ez5P4rBkbpArwsUVr7n2cizKBZX9KCi8x/LB2ZKdOB3LRTmeIuLs du8qnmkjWI6OBsUe9/MLOWtPI46j9x3/3ijAAxrV7y+lv9Td7gekduZqnzlUGfrhXkAa QoG5T8xad47jlAZUUAf9p6XASAKYRxsWo2aqbkg2rzWy2yyzApzXOrqWduncgQJikETu bnMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sZJlHjmz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i8-20020a639d08000000b0051ba2ec8320si21089133pgd.353.2023.05.17.09.50.22; Wed, 17 May 2023 09:50:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=k20201202 header.b=sZJlHjmz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229660AbjEQQ0v (ORCPT + 99 others); Wed, 17 May 2023 12:26:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229634AbjEQQ0s (ORCPT ); Wed, 17 May 2023 12:26:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3137130; Wed, 17 May 2023 09:26:47 -0700 (PDT) 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 8FF0D63D9C; Wed, 17 May 2023 16:26:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83718C433D2; Wed, 17 May 2023 16:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684340807; bh=sU1C7XJg/7VvloWpwX9yx2Ma9fhNOkvoRR16fGxVrx4=; h=From:To:Cc:Subject:Date:From; b=sZJlHjmztkvkLKxHbNj52fhsNhecUqM37bGatmGQxktUqEdItN6NL5LT81V2t091h gPcnMFAc4lv9o6eMpujnLyfiItRFzKYUVq04zMGhsHGW8TlWs6aPW8/qBYsGTQd3bH Yqul0tjCKB1OEQlFvxnj6oyty7r0DvSw62ycW3nV5MfdlkgPfgzublOcRIf2hxfnup wO6fGalPgH4Yha0Fy6jCA5HXWHpPEpcQFbaO9ayWcfJ1QMlfeEWH4TpdoLo2N6cIn9 XdrYaNigaP+qblqjiHbOFziGE0A/8WhqPj7v0QnQB09sTVfVptanFsFJrBRx2ONgce J9jFpKhWTDKag== From: Jeff Layton To: Chuck Lever Cc: Zhi Li , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] nfsd: make a copy of struct iattr before calling notify_change Date: Wed, 17 May 2023 12:26:44 -0400 Message-Id: <20230517162645.254512-1-jlayton@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 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,T_SCC_BODY_TEXT_LINE 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766160843215060375?= X-GMAIL-MSGID: =?utf-8?q?1766160843215060375?= notify_change can modify the iattr structure. In particular it can can end up setting ATTR_MODE when ATTR_KILL_SUID is already set, causing a BUG() if the same iattr is passed to notify_change more than once. Make a copy of the struct iattr before calling notify_change. Fixes: 34b91dda7124 NFSD: Make nfsd4_setattr() wait before returning NFS4ERR_DELAY Link: https://bugzilla.redhat.com/show_bug.cgi?id=2207969 Reported-by: Zhi Li Signed-off-by: Jeff Layton Tested-by: Zhi Li --- fs/nfsd/vfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index c4ef24c5ffd0..ad0c5cd900b1 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -538,7 +538,9 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, inode_lock(inode); for (retries = 1;;) { - host_err = __nfsd_setattr(dentry, iap); + struct iattr attrs = *iap; + + host_err = __nfsd_setattr(dentry, &attrs); if (host_err != -EAGAIN || !retries--) break; if (!nfsd_wait_for_delegreturn(rqstp, inode))