Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dm integrity: use crypto_shash_digest() in sb_mac()

Simplify sb_mac() by using crypto_shash_digest() instead of an
init+update+final sequence. This should also improve performance.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>

authored by

Eric Biggers and committed by
Mike Snitzer
070bb43a 6d0ee3b6

+10 -20
+10 -20
drivers/md/dm-integrity.c
··· 493 493 { 494 494 SHASH_DESC_ON_STACK(desc, ic->journal_mac); 495 495 int r; 496 - unsigned int size = crypto_shash_digestsize(ic->journal_mac); 496 + unsigned int mac_size = crypto_shash_digestsize(ic->journal_mac); 497 + __u8 *sb = (__u8 *)ic->sb; 498 + __u8 *mac = sb + (1 << SECTOR_SHIFT) - mac_size; 497 499 498 - if (sizeof(struct superblock) + size > 1 << SECTOR_SHIFT) { 500 + if (sizeof(struct superblock) + mac_size > 1 << SECTOR_SHIFT) { 499 501 dm_integrity_io_error(ic, "digest is too long", -EINVAL); 500 502 return -EINVAL; 501 503 } 502 504 503 505 desc->tfm = ic->journal_mac; 504 506 505 - r = crypto_shash_init(desc); 506 - if (unlikely(r < 0)) { 507 - dm_integrity_io_error(ic, "crypto_shash_init", r); 508 - return r; 509 - } 510 - 511 - r = crypto_shash_update(desc, (__u8 *)ic->sb, (1 << SECTOR_SHIFT) - size); 512 - if (unlikely(r < 0)) { 513 - dm_integrity_io_error(ic, "crypto_shash_update", r); 514 - return r; 515 - } 516 - 517 507 if (likely(wr)) { 518 - r = crypto_shash_final(desc, (__u8 *)ic->sb + (1 << SECTOR_SHIFT) - size); 508 + r = crypto_shash_digest(desc, sb, mac - sb, mac); 519 509 if (unlikely(r < 0)) { 520 - dm_integrity_io_error(ic, "crypto_shash_final", r); 510 + dm_integrity_io_error(ic, "crypto_shash_digest", r); 521 511 return r; 522 512 } 523 513 } else { 524 - __u8 result[HASH_MAX_DIGESTSIZE]; 514 + __u8 actual_mac[HASH_MAX_DIGESTSIZE]; 525 515 526 - r = crypto_shash_final(desc, result); 516 + r = crypto_shash_digest(desc, sb, mac - sb, actual_mac); 527 517 if (unlikely(r < 0)) { 528 - dm_integrity_io_error(ic, "crypto_shash_final", r); 518 + dm_integrity_io_error(ic, "crypto_shash_digest", r); 529 519 return r; 530 520 } 531 - if (memcmp((__u8 *)ic->sb + (1 << SECTOR_SHIFT) - size, result, size)) { 521 + if (memcmp(mac, actual_mac, mac_size)) { 532 522 dm_integrity_io_error(ic, "superblock mac", -EILSEQ); 533 523 dm_audit_log_target(DM_MSG_PREFIX, "mac-superblock", ic->ti, 0); 534 524 return -EILSEQ;