2020-09-09 19:10:15

by Alex Dewar

Subject: [PATCH] ima: Use kmemdup rather than kmalloc+memcpy

Issue identified with Coccinelle.

Signed-off-by: Alex Dewar <[email protected]>
---
security/integrity/ima/ima_policy.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index b4de33074b37..1de3140b334f 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -284,15 +284,14 @@ static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry)
struct ima_rule_entry *nentry;
int i;

- nentry = kmalloc(sizeof(*nentry), GFP_KERNEL);
- if (!nentry)
- return NULL;
-
/*
* Immutable elements are copied over as pointers and data; only
* lsm rules can change
*/
- memcpy(nentry, entry, sizeof(*nentry));
+ nentry = kmemdup(entry, sizeof(*nentry), GFP_KERNEL);
+ if (!nentry)
+ return NULL;
+
memset(nentry->lsm, 0, sizeof_field(struct ima_rule_entry, lsm));

for (i = 0; i < MAX_LSM_RULES; i++) {
--
2.28.0

2020-09-15 14:31:11

by Mimi Zohar

Subject: Re: [PATCH] ima: Use kmemdup rather than kmalloc+memcpy

On Wed, 2020-09-09 at 20:09 +0100, Alex Dewar wrote:
> Issue identified with Coccinelle.
>
> Signed-off-by: Alex Dewar <[email protected]>

Thank you.

Mimi