2009-12-06 09:17:00

by Julia Lawall

Subject: [PATCH 5/5] security/selinux/ss: correct size computation

From: Julia Lawall <[email protected]>

The size argument to kcalloc should be the size of desired structure,
not the pointer to it.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@expression@
expression *x;
@@

x =
<+...
-sizeof(x)
+sizeof(*x)
...+>// </smpl>

Signed-off-by: Julia Lawall <[email protected]>

---
security/selinux/ss/services.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff -u -p a/security/selinux/ss/services.c b/security/selinux/ss/services.c
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2555,7 +2555,7 @@ int security_get_classes(char ***classes
read_lock(&policy_rwlock);

*nclasses = policydb.p_classes.nprim;
- *classes = kcalloc(*nclasses, sizeof(*classes), GFP_ATOMIC);
+ *classes = kcalloc(*nclasses, sizeof(**classes), GFP_ATOMIC);
if (!*classes)
goto out;

@@ -2602,7 +2602,7 @@ int security_get_permissions(char *class
}

*nperms = match->permissions.nprim;
- *perms = kcalloc(*nperms, sizeof(*perms), GFP_ATOMIC);
+ *perms = kcalloc(*nperms, sizeof(**perms), GFP_ATOMIC);
if (!*perms)
goto out;

2009-12-07 15:02:25

by Eric Paris

Subject: Re: [PATCH 5/5] security/selinux/ss: correct size computation

On Sun, 2009-12-06 at 10:16 +0100, Julia Lawall wrote:
> From: Julia Lawall <[email protected]>
>
> The size argument to kcalloc should be the size of desired structure,
> not the pointer to it.
>
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @expression@
> expression *x;
> @@
>
> x =
> <+...
> -sizeof(x)
> +sizeof(*x)
> ...+>// </smpl>
>
> Signed-off-by: Julia Lawall <[email protected]>

Acked-by: Eric Paris <[email protected]>

no real hurry, to get this in, the sizeof() is the same in either case,
but it should be fixed.


>
> ---
> security/selinux/ss/services.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff -u -p a/security/selinux/ss/services.c b/security/selinux/ss/services.c
> --- a/security/selinux/ss/services.c
> +++ b/security/selinux/ss/services.c
> @@ -2555,7 +2555,7 @@ int security_get_classes(char ***classes
> read_lock(&policy_rwlock);
>
> *nclasses = policydb.p_classes.nprim;
> - *classes = kcalloc(*nclasses, sizeof(*classes), GFP_ATOMIC);
> + *classes = kcalloc(*nclasses, sizeof(**classes), GFP_ATOMIC);
> if (!*classes)
> goto out;
>
> @@ -2602,7 +2602,7 @@ int security_get_permissions(char *class
> }
>
> *nperms = match->permissions.nprim;
> - *perms = kcalloc(*nperms, sizeof(*perms), GFP_ATOMIC);
> + *perms = kcalloc(*nperms, sizeof(**perms), GFP_ATOMIC);
> if (!*perms)
> goto out;
>

2009-12-07 22:11:33

by James Morris

Subject: Re: [PATCH 5/5] security/selinux/ss: correct size computation

On Sun, 6 Dec 2009, Julia Lawall wrote:

> From: Julia Lawall <[email protected]>
>
> The size argument to kcalloc should be the size of desired structure,
> not the pointer to it.
>
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @expression@
> expression *x;
> @@
>
> x =
> <+...
> -sizeof(x)
> +sizeof(*x)
> ...+>// </smpl>
>
> Signed-off-by: Julia Lawall <[email protected]>


Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next


--
James Morris
<[email protected]>