From: "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Jeff Layton <jlayton@redhat.com>,
Ilya Dryomov <idryomov@gmail.com>,
"Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
Subject: [PATCH review for 4.4 20/26] ceph: clean up unsafe d_parent accesses in build_dentry_path
Date: Mon, 25 Sep 2017 01:13:43 +0000 [thread overview]
Message-ID: <20170925011322.10133-20-alexander.levin@verizon.com> (raw)
In-Reply-To: <20170925011322.10133-1-alexander.levin@verizon.com>
From: Jeff Layton <jlayton@redhat.com>
[ Upstream commit c6b0b656ca24ede6657abb4a2cd910fa9c1879ba ]
While we hold a reference to the dentry when build_dentry_path is
called, we could end up racing with a rename that changes d_parent.
Handle that situation correctly, by using the rcu_read_lock to
ensure that the parent dentry and inode stick around long enough
to safely check ceph_snap and ceph_ino.
Link: http://tracker.ceph.com/issues/18148
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
fs/ceph/mds_client.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index f54f77037d22..ead89489ae71 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1845,13 +1845,18 @@ static int build_dentry_path(struct dentry *dentry,
int *pfreepath)
{
char *path;
+ struct inode *dir;
- if (ceph_snap(d_inode(dentry->d_parent)) == CEPH_NOSNAP) {
- *pino = ceph_ino(d_inode(dentry->d_parent));
+ rcu_read_lock();
+ dir = d_inode_rcu(dentry->d_parent);
+ if (dir && ceph_snap(dir) == CEPH_NOSNAP) {
+ *pino = ceph_ino(dir);
+ rcu_read_unlock();
*ppath = dentry->d_name.name;
*ppathlen = dentry->d_name.len;
return 0;
}
+ rcu_read_unlock();
path = ceph_mdsc_build_path(dentry, ppathlen, pino, 1);
if (IS_ERR(path))
return PTR_ERR(path);
--
2.11.0
next prev parent reply other threads:[~2017-09-25 1:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-25 1:13 [PATCH review for 4.4 01/26] locking/lockdep: Add nest_lock integrity test Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 04/26] mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 03/26] irqchip/crossbar: Fix incorrect type of local variables Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 02/26] watchdog: kempld: fix gcc-4.3 build Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 05/26] mac80211: fix power saving clients handling in iwlwifi Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 06/26] net/mlx4_en: fix overflow in mlx4_en_init_timestamp() Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 07/26] netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 09/26] Btrfs: send, fix failure to rename top level inode due to name collision Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 08/26] iio: adc: xilinx: Fix error handling Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 10/26] f2fs: do not wait for writeback in write_begin Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 12/26] sparc64: Migrate hvcons irq to panicked cpu Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 11/26] md/linear: shutup lockdep warnning Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 13/26] net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 14/26] crypto: xts - Add ECB dependency Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 15/26] ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 18/26] net: mvpp2: release reference to txq_cpu[] entry after unmapping Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 17/26] scsi: scsi_dh_emc: return success in clariion_std_inquiry() Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 16/26] slub: do not merge cache if slub_debug contains a never-merge flag Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 19/26] i2c: at91: ensure state is restored after suspending Levin, Alexander (Sasha Levin)
2017-09-25 7:22 ` Alexandre Belloni
2017-09-25 14:33 ` Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` Levin, Alexander (Sasha Levin) [this message]
2017-09-25 1:13 ` [PATCH review for 4.4 23/26] target/iscsi: Fix unsolicited data seq_end_offset calculation Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 22/26] uapi: fix linux/mroute6.h userspace compilation errors Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 21/26] uapi: fix linux/rds.h " Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 25/26] genirq: Clarify logic calculating bogus irqreturn_t values Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 26/26] cpufreq: CPPC: add ACPI_PROCESSOR dependency Levin, Alexander (Sasha Levin)
2017-09-25 1:13 ` [PATCH review for 4.4 24/26] nfsd/callback: Cleanup callback cred on shutdown Levin, Alexander (Sasha Levin)
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=20170925011322.10133-20-alexander.levin@verizon.com \
--to=alexander.levin@verizon.com \
--cc=idryomov@gmail.com \
--cc=jlayton@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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
all inboxes | Powered by JetHome®