From: "Ahmed S. Darwish" <darwish.07@gmail.com>
To: Casey Schaufler <casey@schaufler-ca.com>
Cc: torvalds@osdl.org, akpm@osdl.org,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] Smackv8: Omit non-cipso labels in cipso_seq_start
Date: Sun, 21 Oct 2007 03:40:21 +0200 [thread overview]
Message-ID: <20071021014021.GA3091@Ahmed> (raw)
In-Reply-To: <47158CE4.30706@schaufler-ca.com>
Hi!,
[Casey, sending patches in public to get an early review]
Omit non-cipso labels in cipso_seq_start().
Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
---
stopping seq_show() if smk_cipso = NULL only fixes the bug
symptom. We'll issue a BUG() in that case cause it signals a
serious misbehavior in the list entries.
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 55ba2dc..b061cd0 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -297,14 +297,22 @@ void smk_cipso_doi(void)
/*
* Seq_file read operations for /smack/cipso
+ *
+ * Omit labels with no associated cipso values from being
+ * displayed in seq_show()
*/
static void *cipso_seq_start(struct seq_file *s, loff_t *pos)
{
+ struct smack_known *skp = smack_known;
+
if (*pos >= smack_cipso_count)
return NULL;
- return smack_known;
+ while (skp && !skp->smk_cipso)
+ skp = skp->smk_next;
+
+ return skp;
}
static void *cipso_seq_next(struct seq_file *s, void *v, loff_t *pos)
@@ -313,9 +321,6 @@ static void *cipso_seq_next(struct seq_file *s, void *v, loff_t *pos)
(*pos)++;
- /*
- * Omit labels with no associated cipso value
- */
while (skp && !skp->smk_cipso)
skp = skp->smk_next;
@@ -336,12 +341,11 @@ static int cipso_seq_show(struct seq_file *s, void *v)
int i;
unsigned char m;
- if (scp == NULL)
- return 0;
+ BUG_ON(!scp);
+ cbp = scp->smk_catset;
seq_printf(s, "%s %3d", (char *)&skp->smk_known, scp->smk_level);
- cbp = scp->smk_catset;
for (i = 0; i < SMK_LABELLEN; i++)
for (m = 0x80; m != 0; m >>= 1) {
if (m & cbp[i]) {
--
Ahmed S. Darwish
HomePage: http://darwish.07.googlepages.com
Blog: http://darwish-07.blogspot.com
next prev parent reply other threads:[~2007-10-21 1:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-17 4:17 [PATCH] Version 8 (2.6.23) Smack: Simplified Mandatory Access Control Kernel Casey Schaufler
2007-10-18 4:57 ` Al Viro
2007-10-18 5:10 ` Al Viro
2007-10-19 12:39 ` Ahmed S. Darwish
2007-10-18 20:13 ` Casey Schaufler
2007-10-18 20:26 ` Al Viro
2007-10-21 1:40 ` Ahmed S. Darwish [this message]
2007-10-21 2:25 ` [PATCH] Smackv8: Safe lockless {cipso,load} read operation Ahmed S. Darwish
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=20071021014021.GA3091@Ahmed \
--to=darwish.07@gmail.com \
--cc=akpm@osdl.org \
--cc=casey@schaufler-ca.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=torvalds@osdl.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).