fix fs-integrity for non-PI metadata v2
Subsystems (4)
Hi all,
this series fixes incorrect calls into the PI generation helpers when using fs-integrity on devics with non-PI metadata.
Changes since v1:
- fix two more null pointer dereferences
(I though I already sent this out yesterday, but can't find it in the archives. At least this way I could pick up two more reviews from the post as part of the larger lazy bounce buffer series. Sorry if you somehow got this twice)
Diffstat:
block/bio-integrity-auto.c | 10 ++-------- block/bio-integrity-fs.c | 6 +++++- fs/iomap/bio.c | 2 +- include/linux/bio-integrity.h | 3 +++ 4 files changed, 11 insertions(+), 10 deletions(-)
PATCH 1/4 block: remove bip_should_check
There is no benefit in using this helper over the simple flags check.
--- block/bio-integrity-auto.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
block/bio-integrity-auto.c +2 -6
@@ -45,10 +45,6 @@ static void bio_integrity_verify_fn(struct work_struct *work) }#define BIP_CHECK_FLAGS (BIP_CHECK_GUARD | BIP_CHECK_REFTAG | BIP_CHECK_APPTAG) -static bool bip_should_check (struct bio_integrity_payload *bip) -{ -return bip->bip_flags &BIP_CHECK_FLAGS ; -}/** * __bio_integrity_endio - Integrity I/O completion function
@@ -66,7 +62,7 @@ bool __bio_integrity_endio(struct bio *bio) container_of(bip, struct bio_integrity_data, bip);if (bio_op (bio) ==REQ_OP_READ && !bio->bi_status && -bip_should_check (bip)) { + (bip->bip_flags &BIP_CHECK_FLAGS )) {INIT_WORK (&bid->work, bio_integrity_verify_fn);queue_work (kintegrityd_wq, &bid->work);return false;
@@ -99,7 +95,7 @@ void bio_integrity_prep(struct bio *bio, unsigned int action)bio_integrity_setup_default (bio);/* Auto-generate integrity metadata if this is a write */ -if (bio_data_dir (bio) ==WRITE &&bip_should_check (&bid->bip)) +if (bio_data_dir (bio) ==WRITE && (bid->bip.bip_flags &BIP_CHECK_FLAGS ))bio_integrity_generate (bio);else bid->saved_bio_iter = bio->bi_iter;
Signature · 1 line
2.53.0
Re: [PATCH 1/4] block: remove bip_should_check
PATCH 2/4 block: lift BIP_CHECK_FLAGS to include/linux/bio-integrity.h
In reply to Christoph HellwigTo allow for users outside of bio-integrity-auto.c. Also add a little comment explaining it.
--- block/bio-integrity-auto.c | 2 -- include/linux/bio-integrity.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-)
block/bio-integrity-auto.c +0 -2
@@ -44,8 +44,6 @@ static void bio_integrity_verify_fn(struct work_struct *work)bio_endio (bio); } -#define BIP_CHECK_FLAGS (BIP_CHECK_GUARD | BIP_CHECK_REFTAG | BIP_CHECK_APPTAG) -/** * __bio_integrity_endio - Integrity I/O completion function * @bio: Protected bio
include/linux/bio-integrity.h +3 -0
@@ -17,6 +17,9 @@ enum bip_flags { BIP_MEMPOOL = 1 << 15, /* buffer backed by mempool */ }; +/* flags that require generate/verify action. */ +#define BIP_CHECK_FLAGS (BIP_CHECK_GUARD | BIP_CHECK_REFTAG | BIP_CHECK_APPTAG) +struct bio_integrity_payload {struct bvec_iter bip_iter;
Signature · 1 line
2.53.0
Re: [PATCH 2/4] block: lift BIP_CHECK_FLAGS to include/linux/bio-integrity.h
PATCH 3/4 block: handle nogenerate/noverify properly in fs-integrity
In reply to Christoph HellwigCheck the BIP_CHECK flags before generating or verifying PI information, otherwise this can be incorrectly called for non-PI metadata and cause generation of incorrect metadata and crashed in the verification handler.
The new behavior matches that of the block layer auto-generated metadata.
--- block/bio-integrity-fs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
block/bio-integrity-fs.c +5 -1
@@ -46,7 +46,8 @@ void fs_bio_integrity_free(struct bio *bio)void fs_bio_integrity_generate (struct bio *bio) { -if (fs_bio_integrity_alloc (bio)) +if (fs_bio_integrity_alloc (bio) && + (bio_integrity (bio)->bip_flags &BIP_CHECK_FLAGS ))bio_integrity_generate (bio); }EXPORT_SYMBOL_GPL (fs_bio_integrity_generate);
@@ -60,6 +61,9 @@ int fs_bio_integrity_verify(struct bio *bio, sector_t sector, unsigned int size) .bi_size = size, }; +if (!bip || !(bip->bip_flags &BIP_CHECK_FLAGS )) +return 0 ; +/* * Reinitialize bip->bip_iter. *
Signature · 1 line
2.53.0
Re: [PATCH 3/4] block: handle nogenerate/noverify properly in fs-integrity
PATCH 4/4 iomap: don't free integrity payload that doesn't exist
In reply to Christoph Hellwigfs_bio_integrity_alloc might not allocate a bio integrity payload if PI verification is disabled on the block device. Check for that case before calling fs_bio_integirty_free in iomap_bio_read_folio_range_sync to avoid a NULL pointer dereferences.
Make the branch cover the PI verification as well - while fs_bio_integrity_verify works without an integrity payload, it requires one to actually do useful work.
--- fs/iomap/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/iomap/bio.c +1 -1
@@ -179,7 +179,7 @@ int iomap_bio_read_folio_range_sync(const struct iomap_iter *iter,if (srcmap->flags &IOMAP_F_INTEGRITY )fs_bio_integrity_alloc (&bio); error =submit_bio_wait (&bio); -if (srcmap->flags &IOMAP_F_INTEGRITY ) { +if (bio_integrity (&bio)) {if (!error) error =fs_bio_integrity_verify (&bio, sector, len);fs_bio_integrity_free (&bio);
Signature · 1 line
2.53.0
Re: [PATCH 4/4] iomap: don't free integrity payload that doesn't exist
Re: [PATCH 4/4] iomap: don't free integrity payload that doesn't exist
In reply to Christoph HellwigRe: [PATCH 4/4] iomap: don't free integrity payload that doesn't exist
In reply to Christoph HellwigChristoph,
Quoted 3 lines
fs_bio_integrity_allocmight not allocate a bio integrity payload if PI verification is disabled on the block device. Check for that case before callingfs_bio_integirty_freeiniomap_bio_read_folio_range_syncto
^^^^^^^^^
Nit: Typo.
Signature · 1 line
Martin K. Petersen
Martin K. Petersen
Reviewed-byChristoph,
Quoted 2 lines
this series fixes incorrect calls into the PI generation helpers when using fs-integrity on devics with non-PI metadata.
Looks OK.
Signature · 1 line
Martin K. Petersen