From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Mike Snitzer <snitzer@kernel.org>,
Mikulas Patocka <mpatocka@redhat.com>, Song Liu <song@kernel.org>,
Yu Kuai <yukuai3@huawei.com>,
Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Dave Jiang <dave.jiang@intel.com>,
Ira Weiny <ira.weiny@intel.com>, Keith Busch <kbusch@kernel.org>,
Sagi Grimberg <sagi@grimberg.me>,
Chaitanya Kulkarni <kch@nvidia.com>,
linux-block@vger.kernel.org, dm-devel@lists.linux.dev,
linux-raid@vger.kernel.org, nvdimm@lists.linux.dev,
linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org
Subject: [PATCH 01/12] block: initialize integrity buffer to zero before writing it to media
Date: Thu, 13 Jun 2024 10:48:11 +0200 [thread overview]
Message-ID: <20240613084839.1044015-2-hch@lst.de> (raw)
In-Reply-To: <20240613084839.1044015-1-hch@lst.de>
Metadata added by bio_integrity_prep is using plain kmalloc, which leads
to random kernel memory being written media. For PI metadata this is
limited to the app tag that isn't used by kernel generated metadata,
but for non-PI metadata the entire buffer leaks kernel memory.
Fix this by adding the __GFP_ZERO flag to allocations for writes.
Fixes: 7ba1ba12eeef ("block: Block layer data integrity support")
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/bio-integrity.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 2e3e8e04961eae..af7f71d16114de 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -432,6 +432,7 @@ bool bio_integrity_prep(struct bio *bio)
unsigned long start, end;
unsigned int len, nr_pages;
unsigned int bytes, offset, i;
+ gfp_t gfp = GFP_NOIO;
if (!bi)
return true;
@@ -454,11 +455,19 @@ bool bio_integrity_prep(struct bio *bio)
if (!bi->profile->generate_fn ||
!(bi->flags & BLK_INTEGRITY_GENERATE))
return true;
+
+ /*
+ * Zero the memory allocated to not leak uninitialized kernel
+ * memory to disk. For PI this only affects the app tag, but
+ * for non-integrity metadata it affects the entire metadata
+ * buffer.
+ */
+ gfp |= __GFP_ZERO;
}
/* Allocate kernel buffer for protection data */
len = bio_integrity_bytes(bi, bio_sectors(bio));
- buf = kmalloc(len, GFP_NOIO);
+ buf = kmalloc(len, gfp);
if (unlikely(buf == NULL)) {
printk(KERN_ERR "could not allocate integrity buffer\n");
goto err_end_io;
--
2.43.0
next prev parent reply other threads:[~2024-06-13 8:48 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-13 8:48 move integrity settings to queue_limits v3 Christoph Hellwig
2024-06-13 8:48 ` Christoph Hellwig [this message]
2024-06-14 2:02 ` [PATCH 01/12] block: initialize integrity buffer to zero before writing it to media Martin K. Petersen
2024-06-14 12:45 ` Kanchan Joshi
2024-06-13 8:48 ` [PATCH 02/12] md/raid0: don't free conf on raid0_run failure Christoph Hellwig
2024-06-14 2:03 ` Martin K. Petersen
2024-06-13 8:48 ` [PATCH 03/12] md/raid1: " Christoph Hellwig
2024-06-14 2:04 ` Martin K. Petersen
2024-06-13 8:48 ` [PATCH 04/12] dm-integrity: use the nop integrity profile Christoph Hellwig
2024-06-14 2:04 ` Martin K. Petersen
2024-06-13 8:48 ` [PATCH 05/12] block: remove the blk_integrity_profile structure Christoph Hellwig
2024-06-14 2:11 ` Martin K. Petersen
2024-06-13 8:48 ` [PATCH 06/12] block: remove the blk_flush_integrity call in blk_integrity_unregister Christoph Hellwig
2024-06-13 8:48 ` [PATCH 07/12] block: factor out flag_{store,show} helper for integrity Christoph Hellwig
2024-06-13 8:48 ` [PATCH 08/12] block: use kstrtoul in flag_store Christoph Hellwig
2024-06-14 12:46 ` Kanchan Joshi
2024-06-13 8:48 ` [PATCH 09/12] block: don't require stable pages for non-PI metadata Christoph Hellwig
2024-06-13 8:48 ` [PATCH 10/12] block: bypass the STABLE_WRITES flag for protection information Christoph Hellwig
2024-06-13 8:48 ` [PATCH 11/12] block: invert the BLK_INTEGRITY_{GENERATE,VERIFY} flags Christoph Hellwig
2024-06-14 2:11 ` Martin K. Petersen
2024-06-13 8:48 ` [PATCH 12/12] block: move integrity information into queue_limits Christoph Hellwig
2024-06-13 13:40 ` Hannes Reinecke
2024-06-14 2:18 ` Martin K. Petersen
2024-06-14 12:33 ` move integrity settings to queue_limits v3 Jens Axboe
2024-06-14 16:03 ` Christoph Hellwig
2024-06-14 16:04 ` Jens Axboe
2024-06-14 16:07 ` Christoph Hellwig
2024-06-14 16:16 ` Jens Axboe
2024-06-14 16:23 ` Jens Axboe
2024-06-15 5:01 ` Christoph Hellwig
2024-06-14 16:23 ` Jens Axboe
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=20240613084839.1044015-2-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dm-devel@lists.linux.dev \
--cc=ira.weiny@intel.com \
--cc=kbusch@kernel.org \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mpatocka@redhat.com \
--cc=nvdimm@lists.linux.dev \
--cc=sagi@grimberg.me \
--cc=snitzer@kernel.org \
--cc=song@kernel.org \
--cc=vishal.l.verma@intel.com \
--cc=yukuai3@huawei.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).