From patchwork Fri Mar 10 20:27:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 67676 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1090726wrd; Fri, 10 Mar 2023 12:44:16 -0800 (PST) X-Google-Smtp-Source: AK7set9X8b4KB5oDap8URL/4/2eU7HABbfsBCFE2prvgCegkylvnN7zxFoEu5KNMEInrKq5G0B/9 X-Received: by 2002:a05:6a20:4409:b0:d0:3eb7:4189 with SMTP id ce9-20020a056a20440900b000d03eb74189mr3531115pzb.3.1678481056570; Fri, 10 Mar 2023 12:44:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678481056; cv=none; d=google.com; s=arc-20160816; b=Tm9/9cMW7H0H2WsTaniQunyGAdP3RUjThwLG07Hp4dEEbDq/fRPK3jhVInCSMBs5wi bpJD4H67nCOibqUpO6JxsJeTAWZd4q5S74bVeGi/29b1vNg3o+tdGKVtxRfshRZq72la fUCsn2wK18htFarMTTQPl/ps9wawQKA49kgYXvBvSaZMTBPDasAqman4HyIG/RJvvU5b HpmahDJ3AaD0CM5E5sd2/rM8Zj3UfPxKCfo7WP3wAR012ZUi+95qql/vegyGZChu+hE7 l48vR1eP0r6xM9yvMNIQg/72Rv/QzzXO4VpsZSfEo061R7AzzvBeWkVJ028m063mCIoD 4GXw== 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=gBu6dqFBmTlnBNN/3dBzmxDyuOoDYqEuUSTw7+2tapw=; b=sOFdJ8vxO1mEbRTj1+IUu+u5PWIIbbE4Q+tL1h9tLUnEsThxbLy8zpQEyRgtSbea8Z Fg/l/RI624tl9xbpVSljqP/4Vz3OUYy8wCerMu5pOerCbcY3cymWcIDgeFhW1XXs/qMH 4VcKnC7Ens2bsWJfSOvvyFKrdkGlMlMqrxNqbr+xx73xpW5UWPKMB+VZQ/7fkFSMkDkF aqp7Krq10Vvunm/vXhsub8peU2h39OSXspNksGHt0+uHHA5eetaiBmZ8KTOMsOCRTnz1 jxirW2h0r4Ggn53zXtEIGY6txDhYhyRfwDBVAvnBQlfx5GhW8yiw7lmRS3f3gmgeNb0n uQww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=cufGUn6v; 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=zeniv.linux.org.uk Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y24-20020a63ce18000000b0050308edbd50si572456pgf.453.2023.03.10.12.43.15; Fri, 10 Mar 2023 12:44:16 -0800 (PST) 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=@linux.org.uk header.s=zeniv-20220401 header.b=cufGUn6v; 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=zeniv.linux.org.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231328AbjCJU14 (ORCPT + 99 others); Fri, 10 Mar 2023 15:27:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231501AbjCJU1u (ORCPT ); Fri, 10 Mar 2023 15:27:50 -0500 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 C5ABF13904A; Fri, 10 Mar 2023 12:27:39 -0800 (PST) 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=gBu6dqFBmTlnBNN/3dBzmxDyuOoDYqEuUSTw7+2tapw=; b=cufGUn6vVZHnDYRUkw2J4bg61p LopqM5vE4bTdDfW3qL+fYb4fjgDal5K6qAX0ibMs0T/VR2NWJkw83aJaO0yYEfBxxAtFrn+DpyJ0s JLB/QwJW+z3WWA3FVN7UJa1q9mOO/ucNJT6t2pe76qeGrEgJlSJJCA/tcIUvohoGu2TZOiPl1mWw2 BLCe3YLO4xGAtUxpmiXNQM/OMpOcGOWZaGpJ0ly3jkbUsxW7w/PocV8afbHEvls2vwyBnuZsIuI5z VoCtxaMBhev4qJI3KfP0Za0To8sm1YDgS+aPQwtppl94U9ALt/0aR+XorLd7bKEYEdo0ZrqSxspHK FmSteXJg==; Received: from viro by zeniv.linux.org.uk with local (Exim 4.96 #2 (Red Hat Linux)) id 1pajKz-00FPlR-1j; Fri, 10 Mar 2023 20:27:37 +0000 Date: Fri, 10 Mar 2023 20:27:37 +0000 From: Al Viro To: Linus Torvalds Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [git pull] vfs.git fixes Message-ID: <20230310202737.GV3390869@ZenIV> MIME-Version: 1.0 Content-Disposition: inline Sender: Al Viro X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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?1760014952522228940?= X-GMAIL-MSGID: =?utf-8?q?1760014952522228940?= fs/file.c one is a genuine missing speculation barrier in pick_file() (reachable e.g. via close(2)); alpha one is strictly speaking not a bug fix, but only because confusion between preempt_enable() and preempt_disable() is harmless on architecture without CONFIG_PREEMPT. Looks like alpha.git picked the wrong version of patch - that braino used to be there in early versions, but it had been fixed quite a while ago... I've checked what ended up in mainline, fortunately all other parts of commit match the latest variant in my tree. The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git tags/pull-fixes for you to fetch changes up to 609d54441493c99f21c1823dfd66fa7f4c512ff4: fs: prevent out-of-bounds array speculation when closing a file descriptor (2023-03-09 22:46:21 -0500) ---------------------------------------------------------------- pick_file() speculation fix + fix for alpha mis(merge,cherry-pick) Signed-off-by: Al Viro ---------------------------------------------------------------- Al Viro (1): alpha: fix lazy-FPU mis(merged/applied/whatnot) Theodore Ts'o (1): fs: prevent out-of-bounds array speculation when closing a file descriptor arch/alpha/lib/fpreg.c | 4 ++-- fs/file.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)