linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jeff Layton <jlayton@kernel.org>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Ilya Dryomov <idryomov@gmail.com>,
	Sasha Levin <sashal@kernel.org>,
	ceph-devel@vger.kernel.org
Subject: [PATCH AUTOSEL 5.11 22/35] ceph: don't clobber i_snap_caps on non-I_NEW inode
Date: Wed, 12 May 2021 14:01:52 -0400	[thread overview]
Message-ID: <20210512180206.664536-22-sashal@kernel.org> (raw)
In-Reply-To: <20210512180206.664536-1-sashal@kernel.org>

From: Jeff Layton <jlayton@kernel.org>

[ Upstream commit d3c51ae1b8cce5bdaf91a1ce32b33cf5626075dc ]

We want the snapdir to mirror the non-snapped directory's attributes for
most things, but i_snap_caps represents the caps granted on the snapshot
directory by the MDS itself. A misbehaving MDS could issue different
caps for the snapdir and we lose them here.

Only reset i_snap_caps when the inode is I_NEW. Also, move the setting
of i_op and i_fop inside the if block since they should never change
anyway.

Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/ceph/inode.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 2caa6df0bcdf..5eb7eeab3828 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -87,14 +87,15 @@ struct inode *ceph_get_snapdir(struct inode *parent)
 	inode->i_mtime = parent->i_mtime;
 	inode->i_ctime = parent->i_ctime;
 	inode->i_atime = parent->i_atime;
-	inode->i_op = &ceph_snapdir_iops;
-	inode->i_fop = &ceph_snapdir_fops;
-	ci->i_snap_caps = CEPH_CAP_PIN; /* so we can open */
 	ci->i_rbytes = 0;
 	ci->i_btime = ceph_inode(parent)->i_btime;
 
-	if (inode->i_state & I_NEW)
+	if (inode->i_state & I_NEW) {
+		inode->i_op = &ceph_snapdir_iops;
+		inode->i_fop = &ceph_snapdir_fops;
+		ci->i_snap_caps = CEPH_CAP_PIN; /* so we can open */
 		unlock_new_inode(inode);
+	}
 
 	return inode;
 }
-- 
2.30.2


  parent reply	other threads:[~2021-05-12 19:49 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-12 18:01 [PATCH AUTOSEL 5.11 01/35] ARM: 9058/1: cache-v7: refactor v7_invalidate_l1 to avoid clobbering r5/r6 Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 02/35] PCI: thunder: Fix compile testing Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 03/35] dmaengine: dw-edma: Fix crash on loading/unloading driver Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 04/35] ARM: 9066/1: ftrace: pause/unpause function graph tracer in cpu_suspend() Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 05/35] f2fs: fix to avoid out-of-bounds memory access Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 06/35] ACPI / hotplug / PCI: Fix reference count leak in enable_slot() Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 07/35] PCI: tegra: Fix runtime PM imbalance in pex_ep_event_pex_rst_deassert() Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 08/35] Input: elants_i2c - do not bind to i2c-hid compatible ACPI instantiated devices Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 09/35] Input: silead - add workaround for x86 BIOS-es which bring the chip up in a stuck state Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 10/35] NFS: NFS_INO_REVAL_PAGECACHE should mark the change attribute invalid Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 11/35] svcrdma: Don't leak send_ctxt on Send errors Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 12/35] um: Mark all kernel symbols as local Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 13/35] um: Disable CONFIG_GCOV with MODULES Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 14/35] PCI: tegra: Add Tegra194 MCFG quirks for ECAM errata Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 15/35] ARM: 9075/1: kernel: Fix interrupted SMC calls Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 16/35] platform/chrome: cros_ec_typec: Add DP mode check Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 17/35] riscv: Use $(LD) instead of $(CC) to link vDSO Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 18/35] scripts/recordmcount.pl: Fix RISC-V regex for clang Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 19/35] riscv: Workaround mcount name prior to clang-13 Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 20/35] scsi: lpfc: Fix illegal memory access on Abort IOCBs Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 21/35] ceph: fix fscache invalidation Sasha Levin
2021-05-12 18:01 ` Sasha Levin [this message]
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 23/35] ceph: don't allow access to MDS-private inodes Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 24/35] scsi: target: tcmu: Return from tcmu_handle_completions() if cmd_id not found Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 25/35] amdgpu/pm: Prevent force of DCEFCLK on NAVI10 and SIENNA_CICHLID Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 26/35] bridge: Fix possible races between assigning rx_handler_data and setting IFF_BRIDGE_PORT bit Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 27/35] net: hsr: check skb can contain struct hsr_ethhdr in fill_frame_info Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 28/35] nvmet: remove unsupported command noise Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.11 29/35] drm/amd/display: Fix two cursor duplication when using overlay Sasha Levin
2021-05-12 18:02 ` [PATCH AUTOSEL 5.11 30/35] gpiolib: acpi: Add quirk to ignore EC wakeups on Dell Venue 10 Pro 5055 Sasha Levin
2021-05-12 18:02 ` [PATCH AUTOSEL 5.11 31/35] net:CXGB4: fix leak if sk_buff is not used Sasha Levin
2021-05-12 18:02 ` [PATCH AUTOSEL 5.11 32/35] ALSA: hda: generic: change the DAC ctl name for LO+SPK or LO+HP Sasha Levin
2021-05-12 18:02 ` [PATCH AUTOSEL 5.11 33/35] block: reexpand iov_iter after read/write Sasha Levin
2021-05-12 18:02 ` [PATCH AUTOSEL 5.11 34/35] lib: stackdepot: turn depot_lock spinlock to raw_spinlock Sasha Levin
2021-05-12 18:02 ` [PATCH AUTOSEL 5.11 35/35] net: stmmac: Do not enable RX FIFO overflow interrupts 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=20210512180206.664536-22-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=ceph-devel@vger.kernel.org \
    --cc=idryomov@gmail.com \
    --cc=jlayton@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /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).