Commit f710126c authored by Milan Broz's avatar Milan Broz Committed by Mike Snitzer
Browse files

dm crypt: print device name in integrity error message 



This message should better identify the DM device with the integrity
failure.

Signed-off-by: default avatarMilan Broz <gmazyland@gmail.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 7a1cd723

drivers/md/dm-crypt.c

+6 −3
Original line number Diff line number Diff line
@@ -1147,9 +1147,11 @@ static int crypt_convert_block_aead(struct crypt_config *cc, 
		r = crypto_aead_decrypt(req);

	}



	if (r == -EBADMSG)

		DMERR_LIMIT("INTEGRITY AEAD ERROR, sector %llu",

	if (r == -EBADMSG) {

		char b[BDEVNAME_SIZE];

		DMERR_LIMIT("%s: INTEGRITY AEAD ERROR, sector %llu", bio_devname(ctx->bio_in, b),

			    (unsigned long long)le64_to_cpu(*sector));

	}



	if (!r && cc->iv_gen_ops && cc->iv_gen_ops->post)

		r = cc->iv_gen_ops->post(cc, org_iv, dmreq);
@@ -1793,7 +1795,8 @@ static void kcryptd_async_done(struct crypto_async_request *async_req, 
		error = cc->iv_gen_ops->post(cc, org_iv_of_dmreq(cc, dmreq), dmreq);



	if (error == -EBADMSG) {

		DMERR_LIMIT("INTEGRITY AEAD ERROR, sector %llu",

		char b[BDEVNAME_SIZE];

		DMERR_LIMIT("%s: INTEGRITY AEAD ERROR, sector %llu", bio_devname(ctx->bio_in, b),

			    (unsigned long long)le64_to_cpu(*org_sector_of_dmreq(cc, dmreq)));

		io->error = BLK_STS_PROTECTION;

	} else if (error < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE