ima: Fix misuse of dereference of pointer in template_desc_init_fields()
authorXiu Jianfeng <xiujianfeng@huawei.com>
Sat, 12 Nov 2022 09:27:19 +0000 (17:27 +0800)
committerMimi Zohar <zohar@linux.ibm.com>
Wed, 16 Nov 2022 16:47:55 +0000 (11:47 -0500)
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>
security/integrity/ima/ima_template.c

index 49f0626..04c49f0 100644 (file)
@@ -245,11 +245,11 @@ 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;
        }