[<prev] [next>] [day] [month] [year] [list]
Message-ID: <alpine.LRH.2.00.1105131102230.3709@tundra.namei.org>
Date: Fri, 13 May 2011 11:05:31 +1000 (EST)
From: James Morris <jmorris@...ei.org>
To: Linus Torvalds <torvalds@...ux-foundation.org>
cc: Eric Paris <eparis@...hat.com>,
linux-security-module@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [GIT] Fix SELinux logging regression
This removes some debug logging code which should not have been committed,
which swamps the system logs in some circumstances.
Please pull.
The following changes since commit 411f05f123cbd7f8aa1edcae86970755a6e2a9d9:
Ingo Molnar (1):
vsprintf: Turn kptr_restrict off by default
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 for-linus
Eric Paris (1):
SELinux: delete debugging printks from filename_trans rule processing
James Morris (1):
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
security/selinux/ss/policydb.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index e6e7ce0..7102457 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -1819,8 +1819,6 @@ static int filename_trans_read(struct policydb *p, void *fp)
goto out;
nel = le32_to_cpu(buf[0]);
- printk(KERN_ERR "%s: nel=%d\n", __func__, nel);
-
last = p->filename_trans;
while (last && last->next)
last = last->next;
@@ -1857,8 +1855,6 @@ static int filename_trans_read(struct policydb *p, void *fp)
goto out;
name[len] = 0;
- printk(KERN_ERR "%s: ft=%p ft->name=%p ft->name=%s\n", __func__, ft, ft->name, ft->name);
-
rc = next_entry(buf, fp, sizeof(u32) * 4);
if (rc)
goto out;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists