smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luks: Exclude the payload from the size calculation

Browse Source 
Fix the blkmap-size calculation to exclude the LUKS header/payload
offset. This was missed in the initial implementation.

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
Fixes: 0cbfb2d490 ("luks: Provide a way to unlock and map encrypted..")
This commit is contained in:
Simon Glass
2025-11-12 04:55:08 -07:00
parent b68c8fb93b
commit 815974c475
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/block/luks.c
View File

@@ -596,6 +596,7 @@ int luks_create_blkmap(struct udevice *blk, struct disk_partition *pinfo,
struct udevice **blkmapp)
{
u8 essiv_key[SHA256_SUM_LEN]; /* SHA-256 output */
lbaint_t decrypted_size;
struct luks1_phdr *hdr;
struct luks2_hdr *hdr2;
struct blk_desc *desc;
@@ -736,10 +737,15 @@ int luks_create_blkmap(struct udevice *blk, struct disk_partition *pinfo,
}
}
/* Map the encrypted partition to the blkmap device */
log_debug("mapping blkmap: blknr 0 blkcnt %lx payload_offset %x essiv %d\n",
(ulong)pinfo->size, payload_offset, use_essiv);
ret = blkmap_map_crypt(dev, 0, pinfo->size, blk, pinfo->start,
/*
* Map the encrypted partition to the blkmap device. The decrypted size
* is the partition size minus the payload offset
*/
decrypted_size = pinfo->size - payload_offset;
log_debug("mapping blkmap: blknr 0 blkcnt %llx payload_offset %x essiv %d\n",
(unsigned long long)decrypted_size, payload_offset,
use_essiv);
ret = blkmap_map_crypt(dev, 0, decrypted_size, blk, pinfo->start,
master_key, key_size, payload_offset,
use_essiv, use_essiv ? essiv_key : NULL);
if (ret) {