From: Joe Perches <joe@perches.com> To: Paul Moore <paul@paul-moore.com>, Stephen Smalley <sds@tycho.nsa.gov>, Eric Paris <eparis@parisplace.org> Cc: James Morris <jmorris@namei.org>, "Serge E. Hallyn" <serge@hallyn.com>, selinux@tycho.nsa.gov, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/18] security: Remove pr_fmt duplicate logging prefixes Date: Thu, 10 May 2018 08:45:41 -0700 [thread overview] Message-ID: <799f2558f37c5480d42c03e3465754aa8bb30e70.1525964385.git.joe@perches.com> (raw) In-Reply-To: <cover.1525964381.git.joe@perches.com> Converting pr_fmt from a simple define to use KBUILD_MODNAME added some duplicate logging prefixes to existing uses. Remove them. Signed-off-by: Joe Perches <joe@perches.com> --- security/selinux/selinuxfs.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index c0cadbc5f85c..be8f186a6256 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -515,19 +515,19 @@ static int sel_make_policy_nodes(struct selinux_fs_info *fsi) ret = sel_make_bools(fsi); if (ret) { - pr_err("SELinux: failed to load policy booleans\n"); + pr_err("failed to load policy booleans\n"); return ret; } ret = sel_make_classes(fsi); if (ret) { - pr_err("SELinux: failed to load policy classes\n"); + pr_err("failed to load policy classes\n"); return ret; } ret = sel_make_policycap(fsi); if (ret) { - pr_err("SELinux: failed to load policy capabilities\n"); + pr_err("failed to load policy capabilities\n"); return ret; } @@ -570,7 +570,7 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf, length = security_load_policy(fsi->state, data, count); if (length) { - pr_warn_ratelimited("SELinux: failed to load policy\n"); + pr_warn_ratelimited("failed to load policy\n"); goto out; } @@ -620,8 +620,8 @@ static ssize_t sel_write_context(struct file *file, char *buf, size_t size) length = -ERANGE; if (len > SIMPLE_TRANSACTION_LIMIT) { - printk(KERN_ERR "SELinux: %s: context size (%u) exceeds " - "payload max\n", __func__, len); + pr_err("%s: context size (%u) exceeds payload max\n", + __func__, len); goto out; } @@ -956,8 +956,8 @@ static ssize_t sel_write_create(struct file *file, char *buf, size_t size) length = -ERANGE; if (len > SIMPLE_TRANSACTION_LIMIT) { - printk(KERN_ERR "SELinux: %s: context size (%u) exceeds " - "payload max\n", __func__, len); + pr_err("%s: context size (%u) exceeds payload max\n", + __func__, len); goto out; } @@ -1147,8 +1147,8 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size) length = -ERANGE; if (len > SIMPLE_TRANSACTION_LIMIT) { - printk(KERN_ERR "SELinux: %s: context size (%u) exceeds " - "payload max\n", __func__, len); + pr_err("%s: context size (%u) exceeds payload max\n", + __func__, len); goto out; } @@ -1389,8 +1389,8 @@ static int sel_make_bools(struct selinux_fs_info *fsi) ret = security_genfs_sid(fsi->state, "selinuxfs", page, SECCLASS_FILE, &sid); if (ret) { - pr_warn_ratelimited("SELinux: no sid found, defaulting to security isid for %s\n", - page); + pr_warn_ratelimited("no sid found, defaulting to security isid for %s\n", + page); sid = SECINITSID_SECURITY; } @@ -1996,8 +1996,7 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent) goto err; return 0; err: - printk(KERN_ERR "SELinux: %s: failed while creating inodes\n", - __func__); + pr_err("%s: failed while creating inodes\n", __func__); selinux_fs_info_free(sb); @@ -2046,7 +2045,7 @@ static int __init init_sel_fs(void) selinux_null.mnt = selinuxfs_mount = kern_mount(&sel_fs_type); if (IS_ERR(selinuxfs_mount)) { - printk(KERN_ERR "selinuxfs: could not mount!\n"); + pr_err("selinuxfs: could not mount!\n"); err = PTR_ERR(selinuxfs_mount); selinuxfs_mount = NULL; } -- 2.15.0
WARNING: multiple messages have this Message-ID (diff)
From: joe@perches.com (Joe Perches) To: linux-security-module@vger.kernel.org Subject: [PATCH 15/18] security: Remove pr_fmt duplicate logging prefixes Date: Thu, 10 May 2018 08:45:41 -0700 [thread overview] Message-ID: <799f2558f37c5480d42c03e3465754aa8bb30e70.1525964385.git.joe@perches.com> (raw) In-Reply-To: <cover.1525964381.git.joe@perches.com> Converting pr_fmt from a simple define to use KBUILD_MODNAME added some duplicate logging prefixes to existing uses. Remove them. Signed-off-by: Joe Perches <joe@perches.com> --- security/selinux/selinuxfs.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index c0cadbc5f85c..be8f186a6256 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -515,19 +515,19 @@ static int sel_make_policy_nodes(struct selinux_fs_info *fsi) ret = sel_make_bools(fsi); if (ret) { - pr_err("SELinux: failed to load policy booleans\n"); + pr_err("failed to load policy booleans\n"); return ret; } ret = sel_make_classes(fsi); if (ret) { - pr_err("SELinux: failed to load policy classes\n"); + pr_err("failed to load policy classes\n"); return ret; } ret = sel_make_policycap(fsi); if (ret) { - pr_err("SELinux: failed to load policy capabilities\n"); + pr_err("failed to load policy capabilities\n"); return ret; } @@ -570,7 +570,7 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf, length = security_load_policy(fsi->state, data, count); if (length) { - pr_warn_ratelimited("SELinux: failed to load policy\n"); + pr_warn_ratelimited("failed to load policy\n"); goto out; } @@ -620,8 +620,8 @@ static ssize_t sel_write_context(struct file *file, char *buf, size_t size) length = -ERANGE; if (len > SIMPLE_TRANSACTION_LIMIT) { - printk(KERN_ERR "SELinux: %s: context size (%u) exceeds " - "payload max\n", __func__, len); + pr_err("%s: context size (%u) exceeds payload max\n", + __func__, len); goto out; } @@ -956,8 +956,8 @@ static ssize_t sel_write_create(struct file *file, char *buf, size_t size) length = -ERANGE; if (len > SIMPLE_TRANSACTION_LIMIT) { - printk(KERN_ERR "SELinux: %s: context size (%u) exceeds " - "payload max\n", __func__, len); + pr_err("%s: context size (%u) exceeds payload max\n", + __func__, len); goto out; } @@ -1147,8 +1147,8 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size) length = -ERANGE; if (len > SIMPLE_TRANSACTION_LIMIT) { - printk(KERN_ERR "SELinux: %s: context size (%u) exceeds " - "payload max\n", __func__, len); + pr_err("%s: context size (%u) exceeds payload max\n", + __func__, len); goto out; } @@ -1389,8 +1389,8 @@ static int sel_make_bools(struct selinux_fs_info *fsi) ret = security_genfs_sid(fsi->state, "selinuxfs", page, SECCLASS_FILE, &sid); if (ret) { - pr_warn_ratelimited("SELinux: no sid found, defaulting to security isid for %s\n", - page); + pr_warn_ratelimited("no sid found, defaulting to security isid for %s\n", + page); sid = SECINITSID_SECURITY; } @@ -1996,8 +1996,7 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent) goto err; return 0; err: - printk(KERN_ERR "SELinux: %s: failed while creating inodes\n", - __func__); + pr_err("%s: failed while creating inodes\n", __func__); selinux_fs_info_free(sb); @@ -2046,7 +2045,7 @@ static int __init init_sel_fs(void) selinux_null.mnt = selinuxfs_mount = kern_mount(&sel_fs_type); if (IS_ERR(selinuxfs_mount)) { - printk(KERN_ERR "selinuxfs: could not mount!\n"); + pr_err("selinuxfs: could not mount!\n"); err = PTR_ERR(selinuxfs_mount); selinuxfs_mount = NULL; } -- 2.15.0 -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-05-10 15:46 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-10 15:45 [PATCH 00/18] Convert default pr_fmt from empty to KBUILD_MODNAME Joe Perches 2018-05-10 15:45 ` Joe Perches 2018-05-10 15:45 ` Joe Perches 2018-05-10 15:45 ` [PATCH 01/18] kernel: Use pr_fmt Joe Perches 2018-05-10 16:14 ` Paul Moore 2018-05-10 19:05 ` Kees Cook 2018-05-13 19:17 ` Jessica Yu 2018-05-14 13:38 ` Masami Hiramatsu 2018-05-14 18:06 ` Paul E. McKenney 2018-05-14 18:59 ` Paul Moore 2018-05-10 15:45 ` [PATCH 02/18] lib: " Joe Perches 2018-05-10 15:45 ` [PATCH 03/18] printk: Convert pr_fmt from blank define to KBUILD_MODNAME Joe Perches 2018-05-10 16:28 ` Steven Rostedt 2018-05-11 21:39 ` [PATCH] ring_buffer: Update logging to use single line output Joe Perches 2018-07-12 2:57 ` Steven Rostedt 2018-07-12 4:42 ` Joe Perches 2018-07-12 13:00 ` Steven Rostedt 2018-05-11 1:51 ` [PATCH 03/18] printk: Convert pr_fmt from blank define to KBUILD_MODNAME Sergey Senozhatsky 2018-05-11 1:57 ` Joe Perches 2018-05-11 2:12 ` Joe Perches 2018-05-11 2:24 ` Sergey Senozhatsky 2018-05-11 2:23 ` Sergey Senozhatsky 2018-05-11 2:33 ` Joe Perches 2018-05-11 2:41 ` Sergey Senozhatsky 2018-05-11 2:57 ` Joe Perches 2018-05-18 8:42 ` Petr Mladek 2018-05-18 9:10 ` Joe Perches 2018-05-18 20:29 ` Andy Shevchenko 2018-05-19 2:05 ` Joe Perches 2018-05-19 18:27 ` Andy Shevchenko 2018-05-10 15:45 ` [PATCH 04/18] x86: Remove pr_fmt duplicate logging prefixes Joe Perches 2018-05-13 19:27 ` [tip:x86/cleanups] " tip-bot for Joe Perches 2018-05-17 18:27 ` Borislav Petkov 2018-05-17 18:43 ` Joe Perches 2018-05-17 19:14 ` Thomas Gleixner 2019-02-21 6:25 ` Bjorn Helgaas 2018-05-10 15:45 ` [PATCH 05/18] x86/mtrr: Rename main.c to mtrr.c and remove duplicate prefixes Joe Perches 2018-05-13 19:28 ` [tip:x86/cleanups] " tip-bot for Joe Perches 2018-05-10 15:45 ` [PATCH 06/18] net: Remove pr_fmt duplicate logging prefixes Joe Perches 2018-05-10 15:45 ` [PATCH 07/18] blk-mq: " Joe Perches 2018-05-10 15:45 ` [PATCH 08/18] random: " Joe Perches 2018-05-10 15:45 ` [PATCH 09/18] ptp: " Joe Perches 2018-05-10 19:35 ` Richard Cochran 2018-05-10 15:45 ` [PATCH 10/18] efifb: " Joe Perches 2018-05-10 15:45 ` Joe Perches 2018-05-10 15:45 ` [PATCH 11/18] proc: " Joe Perches 2018-05-10 15:45 ` [PATCH 12/18] uprobes: " Joe Perches 2018-05-10 15:45 ` [PATCH 13/18] printk: " Joe Perches 2018-05-11 1:54 ` Sergey Senozhatsky 2018-05-18 8:43 ` Petr Mladek 2018-05-10 15:45 ` [PATCH 14/18] lib/mpi: " Joe Perches 2018-05-10 15:45 ` Joe Perches [this message] 2018-05-10 15:45 ` [PATCH 15/18] security: " Joe Perches 2018-05-10 16:15 ` Paul Moore 2018-05-10 16:15 ` Paul Moore 2018-05-10 15:45 ` [PATCH 16/18] aoe: " Joe Perches 2018-05-10 15:45 ` [PATCH 17/18] security: encrypted-keys: " Joe Perches 2018-05-10 15:45 ` Joe Perches 2018-05-10 15:45 ` Joe Perches 2018-05-10 18:09 ` James Morris 2018-05-10 18:09 ` James Morris 2018-05-10 18:09 ` James Morris 2018-05-10 15:45 ` [PATCH 18/18] rcu: Use pr_fmt to prefix "rcu: " to logging output Joe Perches 2018-05-14 20:29 ` Paul E. McKenney 2018-05-14 20:37 ` Andy Shevchenko 2018-05-14 21:08 ` Paul E. McKenney 2018-05-14 20:52 ` Randy Dunlap 2018-05-14 21:05 ` Paul E. McKenney 2018-05-14 21:41 ` Joe Perches 2018-05-14 22:24 ` Paul E. McKenney 2018-05-14 22:54 ` Joe Perches 2018-05-14 23:58 ` Paul E. McKenney 2018-05-15 0:23 ` Joe Perches 2018-05-15 0:32 ` Paul E. McKenney 2018-05-15 1:22 ` Joe Perches 2018-05-15 3:41 ` Paul E. McKenney 2018-05-15 19:28 ` Paul E. McKenney 2018-05-15 21:11 ` Joe Perches 2018-05-15 21:23 ` Paul E. McKenney
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=799f2558f37c5480d42c03e3465754aa8bb30e70.1525964385.git.joe@perches.com \ --to=joe@perches.com \ --cc=eparis@parisplace.org \ --cc=jmorris@namei.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=paul@paul-moore.com \ --cc=sds@tycho.nsa.gov \ --cc=selinux@tycho.nsa.gov \ --cc=serge@hallyn.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.