| From f6e5f1ef4907d8b7ce9ad9e02ece840579de641d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 12 Nov 2022 17:27:19 +0800 |
| Subject: ima: Fix misuse of dereference of pointer in |
| template_desc_init_fields() |
| |
| From: Xiu Jianfeng <xiujianfeng@huawei.com> |
| |
| [ Upstream commit 25369175ce84813dd99d6604e710dc2491f68523 ] |
| |
| The input parameter @fields is type of struct ima_template_field ***, so |
| when allocates array memory for @fields, the size of element should be |
| sizeof(**field) instead of sizeof(*field). |
| |
| Actually the original code would not cause any runtime error, but it's |
| better to make it logically right. |
| |
| Fixes: adf53a778a0a ("ima: new templates management mechanism") |
| Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com> |
| Reviewed-by: Roberto Sassu <roberto.sassu@huawei.com> |
| Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 8687882277a1..ff49f9292931 100644 |
| --- a/security/integrity/ima/ima_template.c |
| +++ b/security/integrity/ima/ima_template.c |
| @@ -196,11 +196,11 @@ static int template_desc_init_fields(const char *template_fmt, |
| } |
| |
| if (fields && num_fields) { |
| - *fields = kmalloc_array(i, sizeof(*fields), GFP_KERNEL); |
| + *fields = kmalloc_array(i, sizeof(**fields), GFP_KERNEL); |
| if (*fields == NULL) |
| return -ENOMEM; |
| |
| - memcpy(*fields, found_fields, i * sizeof(*fields)); |
| + memcpy(*fields, found_fields, i * sizeof(**fields)); |
| *num_fields = i; |
| } |
| |
| -- |
| 2.35.1 |
| |
