linux-kernel - Re: [PATCH] ima: Fix the error code for restoring the PCR value

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <9df8d712-0e58-f95d-8f95-5feae2150b42@huawei.com>
Date:   Tue, 23 Mar 2021 21:40:33 +0800
From:   Li Huafei <lihuafei1@...wei.com>
To:     <zohar@...ux.ibm.com>, <roberto.sassu@...wei.com>,
        <linux-integrity@...r.kernel.org>,
        <linux-security-module@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>
CC:     <dmitry.kasatkin@...il.com>, <jmorris@...ei.org>,
        <serge@...lyn.com>, <yangjihong1@...wei.com>,
        <zhangjinhao2@...wei.com>, lihuafei <lihuafei1@...wei.com>
Subject: Re: [PATCH] ima: Fix the error code for restoring the PCR value

ping. :-)

On 2021/3/3 11:28, Li Huafei wrote:
> 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: 47fdee60b47f ("ima: use ima_parse_buf() to parse measurements headers")
> Signed-off-by: Li Huafei <lihuafei1@...wei.com>
> ---
>   security/integrity/ima/ima_template.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
> index e22e510ae92d..4e081e650047 100644
> --- a/security/integrity/ima/ima_template.c
> +++ b/security/integrity/ima/ima_template.c
> @@ -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;
>