summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorSteve Grubb <sgrubb@redhat.com>2005-11-03 15:48:08 +0000
committerAl Viro <viro@zeniv.linux.org.uk>2006-03-20 14:08:53 -0500
commit90d526c074ae5db484388da56c399acf892b6c17 (patch)
treeedeb7c47d9144f3995846c5fc25db8e49ef12f5d /security
parentb63862f46547487388e582e8ac9083830d34f058 (diff)
downloadlinux-3.10-90d526c074ae5db484388da56c399acf892b6c17.tar.gz
linux-3.10-90d526c074ae5db484388da56c399acf892b6c17.tar.bz2
linux-3.10-90d526c074ae5db484388da56c399acf892b6c17.zip
[PATCH] Define new range of userspace messages.
The attached patch updates various items for the new user space messages. Please apply. Signed-off-by: Steve Grubb <sgrubb@redhat.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/nlmsgtab.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index 69b9329b205..d7c0e912c5f 100644
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -145,8 +145,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm)
break;
case SECCLASS_NETLINK_AUDIT_SOCKET:
- if (nlmsg_type >= AUDIT_FIRST_USER_MSG &&
- nlmsg_type <= AUDIT_LAST_USER_MSG) {
+ if ((nlmsg_type >= AUDIT_FIRST_USER_MSG &&
+ nlmsg_type <= AUDIT_LAST_USER_MSG) ||
+ (nlmsg_type >= AUDIT_FIRST_USER_MSG2 &&
+ nlmsg_type <= AUDIT_LAST_USER_MSG2)) {
*perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY;
} else {
err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms,