Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp871350pxb; Tue, 1 Feb 2022 12:08:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZW3jGmFGiHoUyJKf+DalSKZMR3gwiWkxEVkPcL0ZBOcw1tw+f+bvIpACQBXR1gwYqwqGh X-Received: by 2002:a17:90b:33d2:: with SMTP id lk18mr4178539pjb.224.1643746121107; Tue, 01 Feb 2022 12:08:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643746121; cv=none; d=google.com; s=arc-20160816; b=DREnqNI2rraY8DAkWHURRZMse8fbC5rt+x4OlbEo+UdPqkhtEAip8TdGadJxP+qBnS 6e3wha3+jIR5XoZfM6MujFrVgfzXk6GeyVzgtVTfYwgIKgySb3oLfHOQsaBbPjGeSoN/ MsvElKKKOJil04mS0ZXoLzkBPwC6AYp+X06Y/KVbK71JednSr8bdk8awbpWMHgyvVyIr glrBwCHNmN1E3137Ft9O5uyubL5NYAlERlV3Ror1CqQw5GQYddFw+GH0PrS2JKsJxve4 r1Vw/9gmmBcByVXAoU1d890zAdjfoWGHnl010Lu27zVZJpkefLKhDVqBQkwRwYDYNOAX cKGQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=giNbx3yE3ZhmqbkwUKML6u/lFsbx181PA/B0Lzo38rk=; b=e0+ctamkhhZxIAmRp9r5KGK3nWFFFsDyFTl8Csd+MdUNmtoQL8DW7dsdEPsg9rTEKy WHDy53/BkqiBN15z1LoRK4M3AFx+SQGP4MwYhBt1ERA34IdXZEXBnjoobUXo8Rbcf7Gs XQuKYjPPUS2WqywNjvg7NfzQrHjmS+HfIMlXwsCgUATyk/6Y/4mc4ebFkK/aAnk9skBO uiz6a6XwGznqoHHiCtf3nuo0A96uKNplmVWW+AzJpVnhzsTRhvglABpRDlqZMw3h/Kwx XkNCvP2drk03pbaHUlAz/TmJpe9IVrY75O6Ldj7AAlHRk1xxgRIegXPbMDFuRKPagNMm in6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=npVEQvE1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lp1si3794643pjb.165.2022.02.01.12.08.29; Tue, 01 Feb 2022 12:08:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=npVEQvE1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1378622AbiAaL2w (ORCPT + 99 others); Mon, 31 Jan 2022 06:28:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358957AbiAaLOq (ORCPT ); Mon, 31 Jan 2022 06:14:46 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 057EFC06176F; Mon, 31 Jan 2022 03:11:15 -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 99846611EA; Mon, 31 Jan 2022 11:11:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EE26C340E8; Mon, 31 Jan 2022 11:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643627474; bh=KNeIGLaJULb8ZWWcntvz+PmSfEYYRsngV4QDwM9bi20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=npVEQvE1gqOZ5zbuXi/WE0+jEWXcGV7iZGj2ijxm6ibuOIwNUSKN3579DqeFw+B75 txbO3R8SIG9x1T6sDn0tW5VVwMCxx+bP4yldl88omZGhssQtlU0TVPCv4MGQzGxd9v Uq3d95fkUgnXINqi/D6OL6xU1nzGDMCJOBdI/TpY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Anna Schumaker Subject: [PATCH 5.15 094/171] NFSv4: nfs_atomic_open() can race when looking up a non-regular file Date: Mon, 31 Jan 2022 11:55:59 +0100 Message-Id: <20220131105233.221372623@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220131105229.959216821@linuxfoundation.org> References: <20220131105229.959216821@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust commit 1751fc1db36f6f411709e143d5393f92d12137a9 upstream. If the file type changes back to being a regular file on the server between the failed OPEN and our LOOKUP, then we need to re-run the OPEN. Fixes: 0dd2b474d0b6 ("nfs: implement i_op->atomic_open()") Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker Signed-off-by: Greg Kroah-Hartman --- fs/nfs/dir.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1987,12 +1987,17 @@ no_open: if ((lookup_flags & LOOKUP_DIRECTORY) && inode && !S_ISDIR(inode->i_mode)) res = ERR_PTR(-ENOTDIR); + else if (inode && S_ISREG(inode->i_mode)) + res = ERR_PTR(-EOPENSTALE); } else if (!IS_ERR(res)) { inode = d_inode(res); if ((lookup_flags & LOOKUP_DIRECTORY) && inode && !S_ISDIR(inode->i_mode)) { dput(res); res = ERR_PTR(-ENOTDIR); + } else if (inode && S_ISREG(inode->i_mode)) { + dput(res); + res = ERR_PTR(-EOPENSTALE); } } if (switched) {