Pull misc into release branch

[linux-2.6] / net / netlabel / netlabel_user.c

diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c
index 98a416381e61251e1986eb176d69492ca2d7a7da..89dcc485653bd6601fb078130396d929c81d9038 100644 (file)
--- a/net/netlabel/netlabel_user.c
+++ b/net/netlabel/netlabel_user.c
@@ -101,6 +101,9 @@ struct audit_buffer *netlbl_audit_start_common(int type,
        char *secctx;
        u32 secctx_len;
 
+       if (audit_enabled == 0)
+               return NULL;
+
        audit_buf = audit_log_start(audit_ctx, GFP_ATOMIC, type);
        if (audit_buf == NULL)
                return NULL;