Re: [PATCH 03/13] selinux: Cleanup printk logging in policydb

Joe Perches
2018-06-19T16:45:49Z

On Tue, 2018-06-19 at 12:41 -0400, Paul Moore wrote:
> On Tue, Jun 12, 2018 at 4:09 AM Peter Enderborg
> <peter.enderborg@sony.com> wrote:
> >
> > Replace printk with pr_* to avoid checkpatch warnings and
> > replace KERN_CONT with 2 longer prints.
> >
> > Signed-off-by: Peter Enderborg <peter.enderborg@sony.com>
> > ---
> > security/selinux/ss/policydb.c | 91 +++++++++++++++++++++---------------------
> > 1 file changed, 46 insertions(+), 45 deletions(-)
>
> Merged, thank you. While removing the separate KERN_CONT message
> introduces some duplication, I think that's the right thing to do.
>
> > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
[]
> > @@ -504,7 +504,7 @@ static void hash_eval(struct hashtab *h, const char *hash_name)
> > struct hashtab_info info;
> >
> > hashtab_stat(h, &info);
> > - printk(KERN_DEBUG "SELinux: %s: %d entries and %d/%d buckets used, "
> > + pr_debug("SELinux: %s: %d entries and %d/%d buckets used, "
> > "longest chain length %d\n", hash_name, h->nel,
> > info.slots_used, h->size, info.max_chain_len);
> > }
> > @@ -533,15 +533,17 @@ static int policydb_index(struct policydb *p)
> > {
> > int i, rc;
> >
> > - printk(KERN_DEBUG "SELinux: %d users, %d roles, %d types, %d bools",
> > - p->p_users.nprim, p->p_roles.nprim, p->p_types.nprim, p->p_bools.nprim);
> > if (p->mls_enabled)
> > - printk(KERN_CONT ", %d sens, %d cats", p->p_levels.nprim,
> > - p->p_cats.nprim);
> > - printk(KERN_CONT "\n");
> > + pr_debug("SELinux: %d users, %d roles, %d types, %d bools, %d sens, %d cats",
> > + p->p_users.nprim, p->p_roles.nprim, p->p_types.nprim,
> > + p->p_bools.nprim, p->p_levels.nprim, p->p_cats.nprim);
> > + else
> > + pr_debug("SELinux: %d users, %d roles, %d types, %d bools",
> > + p->p_users.nprim, p->p_roles.nprim, p->p_types.nprim,
> > + p->p_bools.nprim);

This lost the terminating newline on each pr_debug