diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:47:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:47:30 -0400 |
| commit | 5d54e69c68c05b162a56f9914cae72afd7e6f40a (patch) | |
| tree | c5933858c4861bc3e358559f64ef459a1f56ab75 /security/selinux/hooks.c | |
| parent | 63f3d1df1ad276a30b75339dd682a6e1f9d0c181 (diff) | |
| parent | b6ddc518520887a62728b0414efbf802a9dfdd55 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index f40c8221ec1b..6e4937fe062b 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -3389,7 +3389,7 @@ static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb) | |||
| 3389 | err = selinux_nlmsg_lookup(isec->sclass, nlh->nlmsg_type, &perm); | 3389 | err = selinux_nlmsg_lookup(isec->sclass, nlh->nlmsg_type, &perm); |
| 3390 | if (err) { | 3390 | if (err) { |
| 3391 | if (err == -EINVAL) { | 3391 | if (err == -EINVAL) { |
| 3392 | audit_log(current->audit_context, AUDIT_SELINUX_ERR, | 3392 | audit_log(current->audit_context, GFP_KERNEL, AUDIT_SELINUX_ERR, |
| 3393 | "SELinux: unrecognized netlink message" | 3393 | "SELinux: unrecognized netlink message" |
| 3394 | " type=%hu for sclass=%hu\n", | 3394 | " type=%hu for sclass=%hu\n", |
| 3395 | nlh->nlmsg_type, isec->sclass); | 3395 | nlh->nlmsg_type, isec->sclass); |