2020-08-20 10:31:07

by Julia Lawall

[permalink] [raw]
Subject: [PATCH] selinux: fix memdup.cocci warnings

From: kernel test robot <[email protected]>

Use kmemdup rather than duplicating its implementation

Generated by: scripts/coccinelle/api/memdup.cocci

Fixes: c7c556f1e81b ("selinux: refactor changing booleans")
CC: Stephen Smalley <[email protected]>
Signed-off-by: kernel test robot <[email protected]>
Signed-off-by: Julia Lawall <[email protected]>

---

tree: https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git next
head: 37ea433c66070fcef09c6d118492c36299eb72ba
commit: c7c556f1e81bb9e09656ed6650d0c44c84b7c016 [4/6] selinux: refactor changing booleans
:::::: branch date: 4 hours ago
:::::: commit date: 2 days ago

conditional.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -686,12 +686,11 @@ static int cond_bools_copy(struct hashta
{
struct cond_bool_datum *datum;

- datum = kmalloc(sizeof(struct cond_bool_datum), GFP_KERNEL);
+ datum = kmemdup(orig->datum, sizeof(struct cond_bool_datum),
+ GFP_KERNEL);
if (!datum)
return -ENOMEM;

- memcpy(datum, orig->datum, sizeof(struct cond_bool_datum));
-
new->key = orig->key; /* No need to copy, never modified */
new->datum = datum;
return 0;


2020-08-20 12:13:35

by Stephen Smalley

[permalink] [raw]
Subject: Re: [PATCH] selinux: fix memdup.cocci warnings

On Thu, Aug 20, 2020 at 6:20 AM Julia Lawall <[email protected]> wrote:
>
> From: kernel test robot <[email protected]>
>
> Use kmemdup rather than duplicating its implementation
>
> Generated by: scripts/coccinelle/api/memdup.cocci
>
> Fixes: c7c556f1e81b ("selinux: refactor changing booleans")
> CC: Stephen Smalley <[email protected]>
> Signed-off-by: kernel test robot <[email protected]>
> Signed-off-by: Julia Lawall <[email protected]>

Acked-by: Stephen Smalley <[email protected]>

2020-08-20 13:29:42

by Paul Moore

[permalink] [raw]
Subject: Re: [PATCH] selinux: fix memdup.cocci warnings

On Thu, Aug 20, 2020 at 6:20 AM Julia Lawall <[email protected]> wrote:
>
> From: kernel test robot <[email protected]>
>
> Use kmemdup rather than duplicating its implementation
>
> Generated by: scripts/coccinelle/api/memdup.cocci
>
> Fixes: c7c556f1e81b ("selinux: refactor changing booleans")
> CC: Stephen Smalley <[email protected]>
> Signed-off-by: kernel test robot <[email protected]>
> Signed-off-by: Julia Lawall <[email protected]>

Merged into selinux/next, thanks!