From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Trond Myklebust <trond.myklebust@hammerspace.com>
Subject: [PATCH 4.4 14/31] NFS: nfs_igrab_and_active must first reference the superblock
Date: Fri, 22 Jan 2021 15:08:28 +0100 [thread overview]
Message-ID: <20210122135732.446757237@linuxfoundation.org> (raw)
In-Reply-To: <20210122135731.873346566@linuxfoundation.org>
From: Trond Myklebust <trond.myklebust@hammerspace.com>
commit 896567ee7f17a8a736cda8a28cc987228410a2ac upstream.
Before referencing the inode, we must ensure that the superblock can be
referenced. Otherwise, we can end up with iput() calling superblock
operations that are no longer valid or accessible.
Fixes: ea7c38fef0b7 ("NFSv4: Ensure we reference the inode for return-on-close in delegreturn")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/nfs/internal.h | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -534,12 +534,14 @@ extern int nfs41_walk_client_list(struct
static inline struct inode *nfs_igrab_and_active(struct inode *inode)
{
- inode = igrab(inode);
- if (inode != NULL && !nfs_sb_active(inode->i_sb)) {
- iput(inode);
- inode = NULL;
+ struct super_block *sb = inode->i_sb;
+
+ if (sb && nfs_sb_active(sb)) {
+ if (igrab(inode))
+ return inode;
+ nfs_sb_deactive(sb);
}
- return inode;
+ return NULL;
}
static inline void nfs_iput_and_deactive(struct inode *inode)
next prev parent reply other threads:[~2021-01-22 20:06 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 14:08 [PATCH 4.4 00/31] 4.4.253-rc1 review Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 01/31] ASoC: dapm: remove widget from dirty list on free Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 02/31] MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 03/31] mm/hugetlb: fix potential missing huge page size info Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 04/31] ext4: fix bug for rename with RENAME_WHITEOUT Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 05/31] ARC: build: add boot_targets to PHONY Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 06/31] ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 07/31] arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 08/31] misdn: dsp: select CONFIG_BITREVERSE Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 09/31] net: ethernet: fs_enet: Add missing MODULE_LICENSE Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 10/31] ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 11/31] ARM: picoxcell: fix missing interrupt-parent properties Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 12/31] Input: uinput - avoid FF flush when destroying device Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 13/31] dump_common_audit_data(): fix racy accesses to ->d_name Greg Kroah-Hartman
2021-01-22 14:08 ` Greg Kroah-Hartman [this message]
2021-01-22 14:08 ` [PATCH 4.4 15/31] ext4: fix superblock checksum failure when setting password salt Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 16/31] RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 17/31] mm, slub: consider rest of partial list if acquire_slab() fails Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 18/31] net: sunrpc: interpret the return value of kstrtou32 correctly Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 19/31] usb: ohci: Make distrust_firmware param default to false Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 20/31] compiler.h: Raise minimum version of GCC to 5.1 for arm64 Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 21/31] iio: buffer: Fix demux update Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 22/31] nfsd4: readdirplus shouldnt return parent of export Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 23/31] net: cdc_ncm: correct overhead in delayed_ndp_size Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 24/31] netxen_nic: fix MSI/MSI-x interrupts Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 25/31] rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 26/31] net: dcb: Validate netlink message in DCB handler Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 27/31] net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 28/31] net: sit: unregister_netdevice on newlinks error path Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 29/31] rxrpc: Fix handling of an unsupported token type in rxrpc_read() Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 30/31] net: avoid 32 x truesize under-estimation for tiny skbs Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 31/31] spi: cadence: cache reference clock rate during probe Greg Kroah-Hartman
2021-01-23 0:25 ` [PATCH 4.4 00/31] 4.4.253-rc1 review Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210122135732.446757237@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).