Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block

[pandora-kernel.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index d417ca1..f9889ee 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -244,7 +244,7 @@ static int audit_set_rate_limit(int limit, uid_t loginuid, u32 sid)
                char *ctx = NULL;
                u32 len;
                int rc;
-               if ((rc = selinux_ctxid_to_string(sid, &ctx, &len)))
+               if ((rc = selinux_sid_to_string(sid, &ctx, &len)))
                        return rc;
                else
                        audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
@@ -267,7 +267,7 @@ static int audit_set_backlog_limit(int limit, uid_t loginuid, u32 sid)
                char *ctx = NULL;
                u32 len;
                int rc;
-               if ((rc = selinux_ctxid_to_string(sid, &ctx, &len)))
+               if ((rc = selinux_sid_to_string(sid, &ctx, &len)))
                        return rc;
                else
                        audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
@@ -293,7 +293,7 @@ static int audit_set_enabled(int state, uid_t loginuid, u32 sid)
                char *ctx = NULL;
                u32 len;
                int rc;
-               if ((rc = selinux_ctxid_to_string(sid, &ctx, &len)))
+               if ((rc = selinux_sid_to_string(sid, &ctx, &len)))
                        return rc;
                else
                        audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
@@ -321,7 +321,7 @@ static int audit_set_failure(int state, uid_t loginuid, u32 sid)
                char *ctx = NULL;
                u32 len;
                int rc;
-               if ((rc = selinux_ctxid_to_string(sid, &ctx, &len)))
+               if ((rc = selinux_sid_to_string(sid, &ctx, &len)))
                        return rc;
                else
                        audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
@@ -538,7 +538,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                if (status_get->mask & AUDIT_STATUS_PID) {
                        int old   = audit_pid;
                        if (sid) {
-                               if ((err = selinux_ctxid_to_string(
+                               if ((err = selinux_sid_to_string(
                                                sid, &ctx, &len)))
                                        return err;
                                else
@@ -576,7 +576,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                                                 "user pid=%d uid=%u auid=%u",
                                                 pid, uid, loginuid);
                                if (sid) {
-                                       if (selinux_ctxid_to_string(
+                                       if (selinux_sid_to_string(
                                                        sid, &ctx, &len)) {
                                                audit_log_format(ab, 
                                                        " ssid=%u", sid);
@@ -614,7 +614,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                                           loginuid, sid);
                break;
        case AUDIT_SIGNAL_INFO:
-               err = selinux_ctxid_to_string(audit_sig_sid, &ctx, &len);
+               err = selinux_sid_to_string(audit_sig_sid, &ctx, &len);
                if (err)
                        return err;
                sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL);
@@ -690,9 +690,7 @@ static const struct inotify_operations audit_inotify_ops = {
 /* Initialize audit support at boot time. */
 static int __init audit_init(void)
 {
-#ifdef CONFIG_AUDITSYSCALL
        int i;
-#endif
 
        printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
               audit_default ? "enabled" : "disabled");
@@ -717,10 +715,10 @@ static int __init audit_init(void)
        audit_ih = inotify_init(&audit_inotify_ops);
        if (IS_ERR(audit_ih))
                audit_panic("cannot initialize inotify handle");
+#endif
 
        for (i = 0; i < AUDIT_INODE_BUCKETS; i++)
                INIT_LIST_HEAD(&audit_inode_hash[i]);
-#endif
 
        return 0;
 }
@@ -1030,6 +1028,9 @@ void audit_log_hex(struct audit_buffer *ab, const unsigned char *buf,
        struct sk_buff *skb;
        static const unsigned char *hex = "0123456789ABCDEF";
 
+       if (!ab)
+               return;
+
        BUG_ON(!ab->skb);
        skb = ab->skb;
        avail = skb_tailroom(skb);
@@ -1062,6 +1063,9 @@ static void audit_log_n_string(struct audit_buffer *ab, size_t slen,
        unsigned char *ptr;
        struct sk_buff *skb;
 
+       if (!ab)
+               return;
+
        BUG_ON(!ab->skb);
        skb = ab->skb;
        avail = skb_tailroom(skb);