From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Pankaj Raghav <p.raghav@samsung.com>,
Hannes Reinecke <hare@suse.de>,
"Darrick J . Wong" <djwong@kernel.org>,
Dave Chinner <dchinner@redhat.com>,
Daniel Gomez <da.gomez@samsung.com>,
Christian Brauner <brauner@kernel.org>,
Sasha Levin <sashal@kernel.org>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH AUTOSEL 6.6 12/58] iomap: fix iomap_dio_zero() for fs bs > system page size
Date: Fri, 4 Oct 2024 14:23:45 -0400 [thread overview]
Message-ID: <20241004182503.3672477-12-sashal@kernel.org> (raw)
In-Reply-To: <20241004182503.3672477-1-sashal@kernel.org>
From: Pankaj Raghav <p.raghav@samsung.com>
[ Upstream commit 10553a91652d995274da63fc317470f703765081 ]
iomap_dio_zero() will pad a fs block with zeroes if the direct IO size
< fs block size. iomap_dio_zero() has an implicit assumption that fs block
size < page_size. This is true for most filesystems at the moment.
If the block size > page size, this will send the contents of the page
next to zero page(as len > PAGE_SIZE) to the underlying block device,
causing FS corruption.
iomap is a generic infrastructure and it should not make any assumptions
about the fs block size and the page size of the system.
Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
Link: https://lore.kernel.org/r/20240822135018.1931258-7-kernel@pankajraghav.com
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Daniel Gomez <da.gomez@samsung.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/iomap/buffered-io.c | 4 ++--
fs/iomap/direct-io.c | 45 ++++++++++++++++++++++++++++++++++++------
2 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 975fd88c1f0f4..6b89b5589ba28 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -1998,10 +1998,10 @@ iomap_writepages(struct address_space *mapping, struct writeback_control *wbc,
}
EXPORT_SYMBOL_GPL(iomap_writepages);
-static int __init iomap_init(void)
+static int __init iomap_buffered_init(void)
{
return bioset_init(&iomap_ioend_bioset, 4 * (PAGE_SIZE / SECTOR_SIZE),
offsetof(struct iomap_ioend, io_inline_bio),
BIOSET_NEED_BVECS);
}
-fs_initcall(iomap_init);
+fs_initcall(iomap_buffered_init);
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index bcd3f8cf5ea42..409a21144a555 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -11,6 +11,7 @@
#include <linux/iomap.h>
#include <linux/backing-dev.h>
#include <linux/uio.h>
+#include <linux/set_memory.h>
#include <linux/task_io_accounting_ops.h>
#include "trace.h"
@@ -27,6 +28,13 @@
#define IOMAP_DIO_WRITE (1U << 30)
#define IOMAP_DIO_DIRTY (1U << 31)
+/*
+ * Used for sub block zeroing in iomap_dio_zero()
+ */
+#define IOMAP_ZERO_PAGE_SIZE (SZ_64K)
+#define IOMAP_ZERO_PAGE_ORDER (get_order(IOMAP_ZERO_PAGE_SIZE))
+static struct page *zero_page;
+
struct iomap_dio {
struct kiocb *iocb;
const struct iomap_dio_ops *dops;
@@ -232,13 +240,20 @@ void iomap_dio_bio_end_io(struct bio *bio)
}
EXPORT_SYMBOL_GPL(iomap_dio_bio_end_io);
-static void iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio,
+static int iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio,
loff_t pos, unsigned len)
{
struct inode *inode = file_inode(dio->iocb->ki_filp);
- struct page *page = ZERO_PAGE(0);
struct bio *bio;
+ if (!len)
+ return 0;
+ /*
+ * Max block size supported is 64k
+ */
+ if (WARN_ON_ONCE(len > IOMAP_ZERO_PAGE_SIZE))
+ return -EINVAL;
+
bio = iomap_dio_alloc_bio(iter, dio, 1, REQ_OP_WRITE | REQ_SYNC | REQ_IDLE);
fscrypt_set_bio_crypt_ctx(bio, inode, pos >> inode->i_blkbits,
GFP_KERNEL);
@@ -246,8 +261,9 @@ static void iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio,
bio->bi_private = dio;
bio->bi_end_io = iomap_dio_bio_end_io;
- __bio_add_page(bio, page, len, 0);
+ __bio_add_page(bio, zero_page, len, 0);
iomap_dio_submit_bio(iter, dio, bio, pos);
+ return 0;
}
/*
@@ -356,8 +372,10 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter,
if (need_zeroout) {
/* zero out from the start of the block to the write offset */
pad = pos & (fs_block_size - 1);
- if (pad)
- iomap_dio_zero(iter, dio, pos - pad, pad);
+
+ ret = iomap_dio_zero(iter, dio, pos - pad, pad);
+ if (ret)
+ goto out;
}
/*
@@ -430,7 +448,8 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter,
/* zero out from the end of the write to the end of the block */
pad = pos & (fs_block_size - 1);
if (pad)
- iomap_dio_zero(iter, dio, pos, fs_block_size - pad);
+ ret = iomap_dio_zero(iter, dio, pos,
+ fs_block_size - pad);
}
out:
/* Undo iter limitation to current extent */
@@ -752,3 +771,17 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
return iomap_dio_complete(dio);
}
EXPORT_SYMBOL_GPL(iomap_dio_rw);
+
+static int __init iomap_dio_init(void)
+{
+ zero_page = alloc_pages(GFP_KERNEL | __GFP_ZERO,
+ IOMAP_ZERO_PAGE_ORDER);
+
+ if (!zero_page)
+ return -ENOMEM;
+
+ set_memory_ro((unsigned long)page_address(zero_page),
+ 1U << IOMAP_ZERO_PAGE_ORDER);
+ return 0;
+}
+fs_initcall(iomap_dio_init);
--
2.43.0
next prev parent reply other threads:[~2024-10-04 18:25 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-04 18:23 [PATCH AUTOSEL 6.6 01/58] selftests/bpf: Fix ARG_PTR_TO_LONG {half-,}uninitialized test Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 02/58] bpf: Check percpu map value size first Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 03/58] bpftool: Fix undefined behavior in qsort(NULL, 0, ...) Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 04/58] bpftool: Fix undefined behavior caused by shifting into the sign bit Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 05/58] s390/boot: Compile all files with the same march flag Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 06/58] s390/facility: Disable compile time optimization for decompressor code Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 07/58] s390/mm: Add cond_resched() to cmm_alloc/free_pages() Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 08/58] bpf, x64: Fix a jit convergence issue Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 09/58] ext4: fix i_data_sem unlock order in ext4_ind_migrate() Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 10/58] ext4: avoid use-after-free in ext4_ext_show_leaf() Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 11/58] ext4: ext4_search_dir should return a proper error Sasha Levin
2024-10-04 18:23 ` Sasha Levin [this message]
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 13/58] ext4: don't set SB_RDONLY after filesystem errors Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 14/58] ext4: nested locking for xattr inode Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 15/58] s390/cpum_sf: Remove WARN_ON_ONCE statements Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 16/58] s390/traps: Handle early warnings gracefully Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 17/58] bpf: Prevent tail call between progs attached to different hooks Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 18/58] ktest.pl: Avoid false positives with grub2 skip regex Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 19/58] RDMA/mad: Improve handling of timed out WRs of mad agent Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 20/58] soundwire: intel_bus_common: enable interrupts before exiting reset Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 21/58] PCI: Add function 0 DMA alias quirk for Glenfly Arise chip Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 22/58] RDMA/rtrs-srv: Avoid null pointer deref during path establishment Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 23/58] clk: bcm: bcm53573: fix OF node leak in init Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 24/58] PCI: Add ACS quirk for Qualcomm SA8775P Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 25/58] i2c: i801: Use a different adapter-name for IDF adapters Sasha Levin
2024-10-04 18:23 ` [PATCH AUTOSEL 6.6 26/58] PCI: Mark Creative Labs EMU20k2 INTx masking as broken Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 27/58] i3c: master: cdns: Fix use after free vulnerability in cdns_i3c_master Driver Due to Race Condition Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 28/58] RISC-V: Don't have MAX_PHYSMEM_BITS exceed phys_addr_t Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 29/58] io_uring: check if we need to reschedule during overflow flush Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 30/58] ntb: ntb_hw_switchtec: Fix use after free vulnerability in switchtec_ntb_remove due to race condition Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 31/58] mfd: intel_soc_pmic_chtwc: Make Lenovo Yoga Tab 3 X90F DMI match less strict Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 32/58] riscv: avoid Imbalance in RAS Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 33/58] RDMA/mlx5: Enforce umem boundaries for explicit ODP page faults Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 34/58] soundwire: cadence: re-check Peripheral status with delayed_work Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 35/58] riscv/kexec_file: Fix relocation type R_RISCV_ADD16 and R_RISCV_SUB16 unknown Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 36/58] media: videobuf2-core: clear memory related fields in __vb2_plane_dmabuf_put() Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 37/58] remoteproc: imx_rproc: Use imx specific hook for find_loaded_rsc_table Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 38/58] clk: imx: Remove CLK_SET_PARENT_GATE for DRAM mux for i.MX7D Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 39/58] fuse: handle idmappings properly in ->write_iter() Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 40/58] serial: protect uart_port_dtr_rts() in uart_shutdown() too Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 41/58] usb: typec: tipd: Free IRQ only if it was requested before Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 42/58] usb: chipidea: udc: enable suspend interrupt after usb reset Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 43/58] usb: dwc2: Adjust the timing of USB Driver Interrupt Registration in the Crashkernel Scenario Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 44/58] comedi: ni_routing: tools: Check when the file could not be opened Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 45/58] LoongArch: Fix memleak in pci_acpi_scan_root() Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 46/58] netfilter: nf_nat: don't try nat source port reallocation for reverse dir clash Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 47/58] netfilter: nf_reject: Fix build warning when CONFIG_BRIDGE_NETFILTER=n Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 48/58] virtio_pmem: Check device status before requesting flush Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 49/58] tools/iio: Add memory allocation failure check for trigger_name Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 50/58] staging: vme_user: added bound check to geoid Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 51/58] driver core: bus: Fix double free in driver API bus_register() Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 52/58] driver core: bus: Return -EIO instead of 0 when show/store invalid bus attribute Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 53/58] scsi: lpfc: Add ELS_RSP cmd to the list of WQEs to flush in lpfc_els_flush_cmd() Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 54/58] scsi: lpfc: Ensure DA_ID handling completion before deleting an NPIV instance Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 55/58] drm/amd/display: Check null pointer before dereferencing se Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 56/58] fbcon: Fix a NULL pointer dereference issue in fbcon_putcs Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 57/58] smb: client: fix UAF in async decryption Sasha Levin
2024-10-04 18:24 ` [PATCH AUTOSEL 6.6 58/58] fbdev: sisfb: Fix strbuf array overflow 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=20241004182503.3672477-12-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=brauner@kernel.org \
--cc=da.gomez@samsung.com \
--cc=dchinner@redhat.com \
--cc=djwong@kernel.org \
--cc=hare@suse.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=p.raghav@samsung.com \
--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