From: Dan Carpenter <error27@gmail.com>
To: John Johansen <john.johansen@canonical.com>
Cc: James Morris <jmorris@namei.org>,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] apparmor: issue with ns name without a following profile
Date: Sat, 07 Aug 2010 11:50:38 +0000 [thread overview]
Message-ID: <20100807110639.GY9031@bicker> (raw)
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().
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
I'm not very familiar with this code and I haven't tested my fix.
Sorry. Please review carefully.
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index 6e85cdb..da34011 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -44,10 +44,12 @@ char *aa_split_fqname(char *fqname, char **ns_name)
/* overwrite ':' with \0 */
*split = 0;
name = skip_spaces(split + 1);
- } else
+ *ns_name = &name[1];
+ } else {
/* a ns name without a following profile is allowed */
+ *ns_name = &name[1];
name = NULL;
- *ns_name = &name[1];
+ }
}
if (name && *name = 0)
name = NULL;
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <error27@gmail.com>
To: John Johansen <john.johansen@canonical.com>
Cc: James Morris <jmorris@namei.org>,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] apparmor: issue with ns name without a following profile
Date: Sat, 7 Aug 2010 13:50:38 +0200 [thread overview]
Message-ID: <20100807110639.GY9031@bicker> (raw)
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().
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
I'm not very familiar with this code and I haven't tested my fix.
Sorry. Please review carefully.
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index 6e85cdb..da34011 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -44,10 +44,12 @@ char *aa_split_fqname(char *fqname, char **ns_name)
/* overwrite ':' with \0 */
*split = 0;
name = skip_spaces(split + 1);
- } else
+ *ns_name = &name[1];
+ } else {
/* a ns name without a following profile is allowed */
+ *ns_name = &name[1];
name = NULL;
- *ns_name = &name[1];
+ }
}
if (name && *name == 0)
name = NULL;
next reply other threads:[~2010-08-07 11:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-07 11:50 Dan Carpenter [this message]
2010-08-07 11:50 ` [patch] apparmor: issue with ns name without a following profile Dan Carpenter
2010-08-12 15:15 ` John Johansen
2010-08-12 15:15 ` John Johansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100807110639.GY9031@bicker \
--to=error27@gmail.com \
--cc=jmorris@namei.org \
--cc=john.johansen@canonical.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.