aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/auditfilter.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/auditfilter.c')
-rw-r--r--kernel/auditfilter.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 14a78cca384e..3152d1aea164 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -19,6 +19,8 @@
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 */ 20 */
21 21
22#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
23
22#include <linux/kernel.h> 24#include <linux/kernel.h>
23#include <linux/audit.h> 25#include <linux/audit.h>
24#include <linux/kthread.h> 26#include <linux/kthread.h>
@@ -247,7 +249,7 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
247 ; 249 ;
248 } 250 }
249 if (unlikely(rule->action == AUDIT_POSSIBLE)) { 251 if (unlikely(rule->action == AUDIT_POSSIBLE)) {
250 printk(KERN_ERR "AUDIT_POSSIBLE is deprecated\n"); 252 pr_err("AUDIT_POSSIBLE is deprecated\n");
251 goto exit_err; 253 goto exit_err;
252 } 254 }
253 if (rule->action != AUDIT_NEVER && rule->action != AUDIT_ALWAYS) 255 if (rule->action != AUDIT_NEVER && rule->action != AUDIT_ALWAYS)
@@ -477,8 +479,8 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
477 /* Keep currently invalid fields around in case they 479 /* Keep currently invalid fields around in case they
478 * become valid after a policy reload. */ 480 * become valid after a policy reload. */
479 if (err == -EINVAL) { 481 if (err == -EINVAL) {
480 printk(KERN_WARNING "audit rule for LSM " 482 pr_warn("audit rule for LSM \'%s\' is invalid\n",
481 "\'%s\' is invalid\n", str); 483 str);
482 err = 0; 484 err = 0;
483 } 485 }
484 if (err) { 486 if (err) {
@@ -707,8 +709,8 @@ static inline int audit_dupe_lsm_field(struct audit_field *df,
707 /* Keep currently invalid fields around in case they 709 /* Keep currently invalid fields around in case they
708 * become valid after a policy reload. */ 710 * become valid after a policy reload. */
709 if (ret == -EINVAL) { 711 if (ret == -EINVAL) {
710 printk(KERN_WARNING "audit rule for LSM \'%s\' is " 712 pr_warn("audit rule for LSM \'%s\' is invalid\n",
711 "invalid\n", df->lsm_str); 713 df->lsm_str);
712 ret = 0; 714 ret = 0;
713 } 715 }
714 716