Messages in this thread | | | Date | Thu, 31 Oct 2013 11:22:14 -0400 | From | Richard Guy Briggs <> | Subject | Re: [PATCH v2] audit: remove useless code in audit_enable |
| |
On Thu, Oct 31, 2013 at 02:31:01PM +0800, Gao feng wrote: > Since kernel parameter is operated before > initcall, so the audit_initialized must be > AUDIT_UNINITIALIZED or DISABLED in audit_enable.
I've queued this patch. Thanks!
> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> > --- > kernel/audit.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > change from v1: > convert "printk(KERN_INFO " to "pr_info(". > thanks Richard for pointing out. > > diff --git a/kernel/audit.c b/kernel/audit.c > index 8378c5e..7c7c028 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -1038,17 +1038,8 @@ static int __init audit_enable(char *str) > if (!audit_default) > audit_initialized = AUDIT_DISABLED; > > - printk(KERN_INFO "audit: %s", audit_default ? "enabled" : "disabled"); > - > - if (audit_initialized == AUDIT_INITIALIZED) { > - audit_enabled = audit_default; > - audit_ever_enabled |= !!audit_default; > - } else if (audit_initialized == AUDIT_UNINITIALIZED) { > - printk(" (after initialization)"); > - } else { > - printk(" (until reboot)"); > - } > - printk("\n"); > + pr_info("audit: %s\n", audit_default ? > + "enabled (after initialization)" : "disabled (until reboot)"); > > return 1; > } > -- > 1.8.3.1 >
- RGB
-- Richard Guy Briggs <rbriggs@redhat.com> Senior Software Engineer Kernel Security AMER ENG Base Operating Systems Remote, Ottawa, Canada Voice: +1.647.777.2635 Internal: (81) 32635 Alt: +1.613.693.0684x3545
| |