From mboxrd@z Thu Jan  1 00:00:00 1970
From: Greg Edwards <gedwards@ddn.com>
Subject: Re: [PATCH 1/2] audit: move processing of "audit" boot param to
	audit_init()
Date: Fri, 2 Mar 2018 13:46:50 -0800
Message-ID: <20180302214650.GB21780@soma>
References: <20180223002207.21102-1-gedwards@ddn.com>
	<20180223002207.21102-2-gedwards@ddn.com>
	<CAHC9VhRpbXbr3SJ6gafjxhoWePHJkJdDV_3SrZLYvz6a-DK70Q@mail.gmail.com>
	<20180227155920.GA13528@psuche>
	<CAHC9VhQT+RzYVA6QTrmaoX3bKZxehtPJAFwBh=2sRwWA8yo7-A@mail.gmail.com>
	<20180227225217.GA23374@psuche>
	<CAHC9VhTfhLfeGiKrz3MT6dL4b789NftN5CBcoLRo3fDKA9YhsQ@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <linux-audit-bounces@redhat.com>
Content-Disposition: inline
In-Reply-To: <CAHC9VhTfhLfeGiKrz3MT6dL4b789NftN5CBcoLRo3fDKA9YhsQ@mail.gmail.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/linux-audit>,
	<mailto:linux-audit-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/linux-audit>
List-Post: <mailto:linux-audit@redhat.com>
List-Help: <mailto:linux-audit-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/linux-audit>,
	<mailto:linux-audit-request@redhat.com?subject=subscribe>
Sender: linux-audit-bounces@redhat.com
Errors-To: linux-audit-bounces@redhat.com
To: Paul Moore <paul@paul-moore.com>
Cc: Richard Guy Briggs <rgb@redhat.com>, linux-audit@redhat.com
List-Id: linux-audit@redhat.com

On Fri, Mar 02, 2018 at 03:33:54PM -0500, Paul Moore wrote:
> On Tue, Feb 27, 2018 at 5:52 PM, Greg Edwards <gedwards@ddn.com> wrote:
>> So, if you want to keep the panic behavior on bad audit parameters, your
>> delayed processing should do the trick.  If it instead, you are fine
>> with just pr_err and leaving audit enabled for that error case, then we
>> are almost back to my original patch, with the exceptions you previously
>> noted:
>>
>>   * leave audit enabled on parsing error
>>   * change panic on audit_set_enabled() failure to pr_err
>>   * handle on/off as well
>
> If we get rid of the need to panic(), which I think we are all okay
> with, I think we can resolve everything with something like this, yes?
>
> diff --git a/kernel/audit.c b/kernel/audit.c
> index 1a3e75d9a66c..d41d09e84163 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -1618,16 +1618,20 @@ postcore_initcall(audit_init);
> /* Process kernel command-line parameter at boot time.  audit=0 or audit=1. */
> static int __init audit_enable(char *str)
> {
> -       long val;
> -
> -       if (kstrtol(str, 0, &val))
> -               panic("audit: invalid 'audit' parameter value (%s)\n", str);
> -       audit_default = (val ? AUDIT_ON : AUDIT_OFF);
> +       if (!strcasecmp(str, "off") || !strcmp(str, "0"))
> +               audit_default = AUDIT_OFF;
> +       else if (!strcasecmp(str, "on") || !strcmp(str, "1"))
> +               audit_default = AUDIT_ON;
> +       else {
> +               pr_err("audit: invalid 'audit' parameter value (%s)\n", str);
> +               audit_default = AUDIT_ON;
> +       }
>
>        if (audit_default == AUDIT_OFF)
>                audit_initialized = AUDIT_DISABLED;
>        if (audit_set_enabled(audit_default))
> -               panic("audit: error setting audit state (%d)\n", audit_default);
> +               pr_err("audit: error setting audit state (%d)\n",
> +                      audit_default);
>
>        pr_info("%s\n", audit_default ?
>                "enabled (after initialization)" : "disabled (until reboot)");
>

Paul, yes this works great, and exactly what I was thinking.

Greg