| Message ID | 799f2558f37c5480d42c03e3465754aa8bb30e70.1525964385.git.joe@perches.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Thu, May 10, 2018 at 11:45 AM, Joe Perches <joe@perches.com> wrote: > 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(-) Acked-by: Paul Moore <paul@paul-moore.com> > 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 >
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; }
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(-)