diff mbox series

[5.6,073/166] NFSv4.2: error out when relink swapfile

Message ID	20200422095056.710030751@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=aqQR=6G=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Murphy Zhou <jencce.kernel@gmail.com>, Trond Myklebust <trond.myklebust@hammerspace.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.6 073/166] NFSv4.2: error out when relink swapfile Date: Wed, 22 Apr 2020 11:56:40 +0200 Message-Id: <20200422095056.710030751@linuxfoundation.org> In-Reply-To: <20200422095047.669225321@linuxfoundation.org> References: <20200422095047.669225321@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.6,005/166] ALSA: hda: Honor PM disablement in PM freeze and thaw_noirq ops [5.6,008/166] xsk: Fix out of boundary write in __xsk_rcv_memcpy [5.6,009/166] libbpf: Fix bpf_get_link_xdp_id flags handling [5.6,011/166] bpf: Prevent re-mmap()ing BPF map as writable for initially r/o mapping [5.6,014/166] netfilter: nf_tables: report EOPNOTSUPP on unsupported flags/object type [5.6,015/166] irqchip/mbigen: Free msi_desc on device teardown [5.6,016/166] rbd: avoid a deadlock on header_rwsem when flushing notifies [5.6,017/166] rbd: call rbd_dev_unprobe() after unwatching and flushing notifies [5.6,020/166] xsk: Add missing check on user supplied headroom size [5.6,021/166] of: unittest: kmemleak on changeset destroy [5.6,022/166] of: unittest: kmemleak in of_unittest_platform_populate() [5.6,023/166] of: unittest: kmemleak in of_unittest_overlay_high_level() [5.6,024/166] of: overlay: kmemleak in dup_and_fixup_symbol_prop() [5.6,026/166] x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump [5.6,029/166] x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set [5.6,031/166] afs: Fix missing XDR advance in xdr_decode_{AFS,YFS}FSFetchStatus() [5.6,033/166] afs: Fix rename operation status delivery [5.6,034/166] afs: Fix afs_d_validate() to set the right directory version [5.6,036/166] block, bfq: turn put_queue into release_process_ref in __bfq_bic_change_cgroup [5.6,037/166] block, bfq: make reparent_leaf_entity actually work only on leaf entities [5.6,041/166] clk: Dont cache errors from clk_ops::get_phase() [5.6,043/166] clk: imx: pll14xx: Add new frequency entries for pll1443x table [5.6,046/166] s390/crypto: explicitly memzero stack key material in aes_s390.c [5.6,048/166] f2fs: fix the panic in do_checkpoint() [5.6,051/166] f2fs: fix wrong check on F2FS_IOC_FSSETXATTR [5.6,052/166] f2fs: fix to avoid use-after-free in f2fs_write_multi_pages() [5.6,054/166] dmaengine: idxd: reflect shadow copy of traffic class programming [5.6,056/166] memory: tegra: Correct debugfs clk rate-range on Tegra30 [5.6,059/166] power: supply: bq27xxx_battery: Silence deferred-probe error [5.6,061/166] arm64: tegra: Add PCIe endpoint controllers nodes for Tegra194 [5.6,062/166] arm64: tegra: Fix Tegra194 PCIe compatible string [5.6,065/166] arm64: dts: marvell: espressobin: add ethernet alias [5.6,068/166] soc: imx: gpc: fix power up sequencing [5.6,069/166] dma-coherent: fix integer overflow in the reserved-memory dma allocation [5.6,072/166] NFSv4/pnfs: Return valid stateids in nfs_layout_find_inode_by_stateid() [5.6,073/166] NFSv4.2: error out when relink swapfile [5.6,074/166] ARM: dts: rockchip: fix lvds-encoder ports subnode for rk3188-bqedison2qc [5.6,077/166] f2fs: fix to show norecovery mount option [5.6,078/166] drivers: thermal: tsens: Release device in success path [5.6,079/166] phy: uniphier-usb3ss: Add Pro5 support [5.6,084/166] s390/cpuinfo: fix wrong output when CPU0 is offline [5.6,085/166] MIPS: DTS: CI20: add DT node for IR sensor [5.6,088/166] btrfs: add RCU locks around block group initialization [5.6,090/166] powerpc/maple: Fix declaration made after definition [5.6,092/166] nfsroot: set tcp as the default transport protocol [5.6,093/166] ext4: do not commit super on read-only bdev [5.6,097/166] drm/amd/display: Dont try hdcp1.4 when content_type is set to type1 [5.6,099/166] platform/x86: intel-hid: fix: Update Tiger Lake ACPI device ID [5.6,101/166] macsec: fix NULL dereference in macsec_upd_offload() [5.6,102/166] drm/nouveau/svm: check for SVM initialized before migrating [5.6,105/166] percpu_counter: fix a data race at vm_committed_as [5.6,106/166] compiler.h: fix error in BUILD_BUG_ON() reporting [5.6,107/166] KVM: s390: vsie: Fix possible race when shadowing region 3 tables [5.6,111/166] csky: Fixup cpu speculative execution to IO area [5.6,113/166] NFS: Fix memory leaks in nfs_pageio_stop_mirroring() [5.6,114/166] ACPI: Update Tiger Lake ACPI device IDs [5.6,115/166] csky: Fixup get wrong psr value from phyical reg [5.6,116/166] f2fs: compress: fix to call missing destroy_compress_ctx() [5.6,117/166] f2fs: fix potential .flags overflow on 32bit architecture [5.6,120/166] f2fs: fix potential deadlock on compressed quota file [5.6,121/166] ACPICA: Fixes for acpiExec namespace init file [5.6,123/166] mfd: cros_ec: Check DT node for usbpd-notify add [5.6,124/166] um: falloc.h needs to be directly included for older libc [5.6,128/166] iommu/vt-d: Fix mm reference leak [5.6,129/166] SUNRPC: fix krb5p mount to provide large enough buffer in rq_rcvsize [5.6,130/166] virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM [5.6,134/166] iommu/vt-d: Silence RCU-list debugging warning in dmar_find_atsr() [5.6,135/166] iommu/vt-d: Fix page request descriptor size [5.6,139/166] csky: Fixup init_fpu compile warning with __init [5.6,140/166] power: supply: axp288_fuel_gauge: Broaden vendor check for Intel Compute Sticks. [5.6,142/166] iommu/amd: Fix the configuration of GCR3 table root pointer [5.6,145/166] platform/chrome: cros_ec: Query EC protocol version if EC transitions between RO/RW [5.6,147/166] net: dsa: bcm_sf2: Fix overflow checks [5.6,148/166] cifs: ignore cached share root handle closing errors [5.6,149/166] dma-debug: fix displaying of dma allocation type [5.6,154/166] tty: evh_bytechan: Fix out of bounds accesses [5.6,156/166] locktorture: Print ratio of acquisitions, not failures [5.6,159/166] docs: Fix path to MTD command line partition parser [5.6,160/166] mtd: lpddr: Fix a double free in probe() [5.6,163/166] bpf: fix buggy r0 retval refinement for tracing helpers [5.6,165/166] bpf: Test_progs, add test to catch retval refine error handling [5.6,166/166] bpf, test_verifier: switch bpf_get_stacks 0 s> r8 test

Commit Message

Greg Kroah-Hartman April 22, 2020, 9:56 a.m. UTC

From: Murphy Zhou <jencce.kernel@gmail.com>

[ Upstream commit f5fdf1243fb750598b46305dd03c553949cfa14f ]

This fixes xfstests generic/356 failure on NFSv4.2.

Signed-off-by: Murphy Zhou <jencce.kernel@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/nfs/nfs4file.c | 3 +++
 1 file changed, 3 insertions(+)

diff mbox series

Patch

diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 1297919e0fce3..8e5d6223ddd35 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -252,6 +252,9 @@  static loff_t nfs42_remap_file_range(struct file *src_file, loff_t src_off,
 	if (remap_flags & ~REMAP_FILE_ADVISORY)
 		return -EINVAL;
 
+	if (IS_SWAPFILE(dst_inode) || IS_SWAPFILE(src_inode))
+		return -ETXTBSY;
+
 	/* check alignment w.r.t. clone_blksize */
 	ret = -EINVAL;
 	if (bs) {