From patchwork Tue Oct 24 06:18:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 157243 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1746872vqx; Mon, 23 Oct 2023 23:19:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJznLxYDyJJIlTjbW4U4sFkYwUHtBX4hKMXQTook8QoBGlvvh52d5b5jRask4Bx6JIdbly X-Received: by 2002:a05:6870:7d06:b0:1e9:feb7:71db with SMTP id os6-20020a0568707d0600b001e9feb771dbmr16042544oab.36.1698128363741; Mon, 23 Oct 2023 23:19:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698128363; cv=none; d=google.com; s=arc-20160816; b=jbSEc9tYk2SL7osPks4Nl4pMMkYUhd3SwtAwz3W+qU+Vwo5+CBYDvO2KtKqq+Nqyg9 LTOETajrOjXvz/CLqPjkjuG2Hq4UnsDSOR0btRMzxfC3jyIewS+t3JM27kDdHVZKaX/8 4FmaoUGuy4xt7TLFL8otLKUL/dnvatNxkQIN2y/4jXUkm6J/ITivyef3TpJAdC+kn4pt OEBq18sjyVck/CEQZohyYV6lrCeXfhjevYwYqjxnVqrxfm1EMPt3N69s5SUAxo1l4fIm APTnLy72RIo9aXzwMwtLWuxQmzIVl1WvJDTfQYh3CrmtNtO0jO/3gKBI3NiQsBzPcgfM /nIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition:mime-version :message-id:subject:cc:to:from:date:dkim-signature; bh=X1BeEIUyP17Oc9/0An+VaavshAKOs04P4D2EreDhKvc=; fh=rLDuGwxyK0MVLEUiEpxtmesL6uwmoVIgug2y5E9+jmk=; b=M13AkHaWA0sYQZOH+u4OCPCcWDlO11/5KwhlEMKazUrSg41AP6mnrPLOo8PquePAEJ 3TDurF7wheS5lqafZEBLXH9lvG8CEKmEPTmSJ9r3q8PPqT/VdxIeuuZTt77vH+145iyt h32kM7OQawQ8dlJH4pg5mbqWmHZEAYcpUUBPuv1cxqWkrbcqJV8Dl78G84INgVevdZzv +V2BEGV2r5WHMKV5n0VBl+GTdRTMAmd6fdvDdCwwnITbQN/jWew+SwfrMrccae9ffJ4W O1TKv/SdEGLcHorADCbL625fg8Z96Uds75h1h+UZR3YGRVAUnHRvJbrjc1mLEs2CNe4N hb6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=CORXTW5x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id m129-20020a633f87000000b005b7ce261d0dsi7762996pga.402.2023.10.23.23.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 23:19:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=CORXTW5x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 6D1268051B41; Mon, 23 Oct 2023 23:19:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232596AbjJXGS7 (ORCPT + 27 others); Tue, 24 Oct 2023 02:18:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232470AbjJXGS5 (ORCPT ); Tue, 24 Oct 2023 02:18:57 -0400 Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [IPv6:2a03:a000:7:0:5054:ff:fe1c:15ff]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB3B8C0; Mon, 23 Oct 2023 23:18:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=linux.org.uk; s=zeniv-20220401; h=Sender:Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To:References; bh=X1BeEIUyP17Oc9/0An+VaavshAKOs04P4D2EreDhKvc=; b=CORXTW5x4gbqjM5cBxVaG0J30z 3I20kBgT+earPcSSpcv9EBDHv4PCVBDJl1ORE3v/5qtO1bOqiyaoiiX+SW0JI6KwvE7IWacrucQSz Ujstk3J7ZB7jIUb/bt8g/0P5EqsbA+Tw63X/madTNBecf0c8bkAJ1Z75sZ/y/3bSqAr7cNnh29cnD R7ZX7VhM0D1yNobnGpGlUR3t1tKcAfLPhSOoLy0LrPMPGuWJIveGFDLdFl40VIfAjh7QIO9JXkwHJ gf5jm3srib3kfacHoFcrTttv6smsKSAxrdIJSQE4Qt7QahYnyRapUqResrQSSrsV6L8H2FFXZNoDO jQT/2V0Q==; Received: from viro by zeniv.linux.org.uk with local (Exim 4.96 #2 (Red Hat Linux)) id 1qvAkf-004nKI-25; Tue, 24 Oct 2023 06:18:53 +0000 Date: Tue, 24 Oct 2023 07:18:53 +0100 From: Al Viro To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org Subject: [git pull] nfsd fix Message-ID: <20231024061853.GG800259@ZenIV> MIME-Version: 1.0 Content-Disposition: inline Sender: Al Viro X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 23 Oct 2023 23:19:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780616647105276092 X-GMAIL-MSGID: 1780616647105276092 Catch from lock_rename() audit; nfsd_rename() checked that both directories belonged to the same filesystem, but only after having done lock_rename(). Trivial fix, tested and acked by nfs folks. Sat in -next for a while... The following changes since commit 94f6f0550c625fab1f373bb86a6669b45e9748b3: Linux 6.6-rc5 (2023-10-08 13:49:43 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git tags/pull-nfsd-fix for you to fetch changes up to 1aee9158bc978f91701c5992e395efbc6da2de3c: nfsd: lock_rename() needs both directories to live on the same fs (2023-10-17 00:24:35 -0400) ---------------------------------------------------------------- fix for lock_rename() misuse in nfsd ---------------------------------------------------------------- Al Viro (1): nfsd: lock_rename() needs both directories to live on the same fs fs/nfsd/vfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)