[PATCH] audit string fields interface + consumer

Updated patch to dynamically allocate audit rule fields in kernel's
internal representation.  Added unlikely() calls for testing memory
allocation result.

Amy Griffis wrote:     [Wed Jan 11 2006, 02:02:31PM EST]
> Modify audit's kernel-userspace interface to allow the specification
> of string fields in audit rules.
>
> Signed-off-by: Amy Griffis <amy.griffis@hp.com>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from 5ffc4a863f92351b720fe3e9c5cd647accff9e03 commit)

1 files changed, 17 insertions, 2 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index 07c5d2bdd38c..4eb97b62d7fa 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -52,6 +52,7 @@
 #include <linux/audit.h>
 
 #include <net/sock.h>
+#include <net/netlink.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 
@@ -361,9 +362,12 @@ static int audit_netlink_ok(kernel_cap_t eff_cap, u16 msg_type)
         switch (msg_type) {
         case AUDIT_GET:
         case AUDIT_LIST:
+        case AUDIT_LIST_RULES:
         case AUDIT_SET:
         case AUDIT_ADD:
+        case AUDIT_ADD_RULE:
         case AUDIT_DEL:
+        case AUDIT_DEL_RULE:
         case AUDIT_SIGNAL_INFO:
                 if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL))
                         err = -EPERM;
@@ -470,12 +474,23 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                 break;
         case AUDIT_ADD:
         case AUDIT_DEL:
-                if (nlh->nlmsg_len < sizeof(struct audit_rule))
+                if (nlmsg_len(nlh) < sizeof(struct audit_rule))
                         return -EINVAL;
                 /* fallthrough */
         case AUDIT_LIST:
                 err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
-                                           uid, seq, data, loginuid);
+                                           uid, seq, data, nlmsg_len(nlh),
+                                           loginuid);
+                break;
+        case AUDIT_ADD_RULE:
+        case AUDIT_DEL_RULE:
+                if (nlmsg_len(nlh) < sizeof(struct audit_rule_data))
+                        return -EINVAL;
+                /* fallthrough */
+        case AUDIT_LIST_RULES:
+                err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
+                                           uid, seq, data, nlmsg_len(nlh),
+                                           loginuid);
                 break;
         case AUDIT_SIGNAL_INFO:
                 sig_data.uid = audit_sig_uid;