diff options
| author | John Johansen <john.johansen@canonical.com> | 2010-08-27 18:33:28 -0700 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-09-08 09:19:31 +1000 |
| commit | 04ccd53f09741c4bc54ab36db000bc1383e4812e (patch) | |
| tree | d8c6e27094cb3b042e852f01c09a3d21979150d2 /security | |
| parent | 3a2dc8382a3e85a51ed9c6f57ea80665ea7a0c95 (diff) | |
| download | op-kernel-dev-04ccd53f09741c4bc54ab36db000bc1383e4812e.zip op-kernel-dev-04ccd53f09741c4bc54ab36db000bc1383e4812e.tar.gz | |
AppArmor: Fix splitting an fqname into separate namespace and profile names
As per Dan Carpenter <error27@gmail.com>
If we have a ns name without a following profile then in the original
code it did "*ns_name = &name[1];". "name" is NULL so "*ns_name" is
0x1. That isn't useful and could cause an oops when this function is
called from aa_remove_profiles().
Beyond this the assignment of the namespace name was wrong in the case
where the profile name was provided as it was being set to &name[1]
after name = skip_spaces(split + 1);
Move the ns_name assignment before updating name for the split and
also add skip_spaces, making the interface more robust.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c index 6e85cdb..506d2ba 100644 --- a/security/apparmor/lib.c +++ b/security/apparmor/lib.c @@ -40,6 +40,7 @@ char *aa_split_fqname(char *fqname, char **ns_name) *ns_name = NULL; if (name[0] == ':') { char *split = strchr(&name[1], ':'); + *ns_name = skip_spaces(&name[1]); if (split) { /* overwrite ':' with \0 */ *split = 0; @@ -47,7 +48,6 @@ char *aa_split_fqname(char *fqname, char **ns_name) } else /* a ns name without a following profile is allowed */ name = NULL; - *ns_name = &name[1]; } if (name && *name == 0) name = NULL; |
