Commit 7990ccaf authored by Li Huafei's avatar Li Huafei Committed by Mimi Zohar
Browse files

ima: Fix the error code for restoring the PCR value 



In ima_restore_measurement_list(), hdr[HDR_PCR].data is pointing to a
buffer of type u8, which contains the dumped 32-bit pcr value.
Currently, only the least significant byte is used to restore the pcr
value. We should convert hdr[HDR_PCR].data to a pointer of type u32
before fetching the value to restore the correct pcr value.

Fixes: 47fdee60 ("ima: use ima_parse_buf() to parse measurements headers")
Signed-off-by: default avatarLi Huafei <lihuafei1@huawei.com>
Reviewed-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent f873b28f

security/integrity/ima/ima_template.c

+2 −2
Original line number Diff line number Diff line
@@ -494,8 +494,8 @@ int ima_restore_measurement_list(loff_t size, void *buf) 
			}

		}



		entry->pcr = !ima_canonical_fmt ? *(hdr[HDR_PCR].data) :

			     le32_to_cpu(*(hdr[HDR_PCR].data));

		entry->pcr = !ima_canonical_fmt ? *(u32 *)(hdr[HDR_PCR].data) :

			     le32_to_cpu(*(u32 *)(hdr[HDR_PCR].data));

		ret = ima_restore_measurement_entry(entry);

		if (ret < 0)

			break;