Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6

This commit is contained in:
Linus Torvalds 2005-09-13 09:47:30 -07:00
commit 5d54e69c68
10 changed files with 357 additions and 172 deletions

View file

@ -3389,7 +3389,7 @@ static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb)
err = selinux_nlmsg_lookup(isec->sclass, nlh->nlmsg_type, &perm);
if (err) {
if (err == -EINVAL) {
audit_log(current->audit_context, AUDIT_SELINUX_ERR,
audit_log(current->audit_context, GFP_KERNEL, AUDIT_SELINUX_ERR,
"SELinux: unrecognized netlink message"
" type=%hu for sclass=%hu\n",
nlh->nlmsg_type, isec->sclass);