lkml.org 
[lkml]   [2020]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH v2 11/20] kasan: add and integrate kasan boot parameters
    On Tue, Nov 10, 2020 at 11:20PM +0100, 'Andrey Konovalov' via kasan-dev wrote:
    [...]
    > +/* kasan.mode=off/prod/full */
    > +static int __init early_kasan_mode(char *arg)
    > +{
    > + if (!arg)
    > + return -EINVAL;
    > +
    > + if (!strcmp(arg, "off"))
    > + kasan_arg_mode = KASAN_ARG_MODE_OFF;
    > + else if (!strcmp(arg, "prod"))
    > + kasan_arg_mode = KASAN_ARG_MODE_PROD;
    > + else if (!strcmp(arg, "full"))
    > + kasan_arg_mode = KASAN_ARG_MODE_FULL;
    > + else
    > + return -EINVAL;
    > +
    > + return 0;
    > +}
    > +early_param("kasan.mode", early_kasan_mode);
    > +
    > +/* kasan.stack=off/on */
    > +static int __init early_kasan_flag_stacktrace(char *arg)
    > +{
    > + if (!arg)
    > + return -EINVAL;
    > +
    > + if (!strcmp(arg, "off"))
    > + kasan_arg_stacktrace = KASAN_ARG_STACKTRACE_OFF;
    > + else if (!strcmp(arg, "on"))
    > + kasan_arg_stacktrace = KASAN_ARG_STACKTRACE_ON;
    > + else
    > + return -EINVAL;
    > +
    > + return 0;
    > +}
    > +early_param("kasan.stacktrace", early_kasan_flag_stacktrace);
    > +
    > +/* kasan.fault=report/panic */
    > +static int __init early_kasan_fault(char *arg)
    > +{
    > + if (!arg)
    > + return -EINVAL;
    > +
    > + if (!strcmp(arg, "report"))
    > + kasan_arg_fault = KASAN_ARG_FAULT_REPORT;
    > + else if (!strcmp(arg, "panic"))
    > + kasan_arg_fault = KASAN_ARG_FAULT_PANIC;
    > + else
    > + return -EINVAL;
    > +
    > + return 0;
    > +}
    [...]

    The above could be simplified, see suggestion below.

    Thanks,
    -- Marco

    ------ >8 ------

    diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c
    index c91f2c06ecb5..71fc481ad21d 100644
    --- a/mm/kasan/hw_tags.c
    +++ b/mm/kasan/hw_tags.c
    @@ -64,10 +64,8 @@ static int __init early_kasan_mode(char *arg)
    kasan_arg_mode = KASAN_ARG_MODE_PROD;
    else if (!strcmp(arg, "full"))
    kasan_arg_mode = KASAN_ARG_MODE_FULL;
    - else
    - return -EINVAL;

    - return 0;
    + return -EINVAL;
    }
    early_param("kasan.mode", early_kasan_mode);

    @@ -81,10 +79,8 @@ static int __init early_kasan_flag_stacktrace(char *arg)
    kasan_arg_stacktrace = KASAN_ARG_STACKTRACE_OFF;
    else if (!strcmp(arg, "on"))
    kasan_arg_stacktrace = KASAN_ARG_STACKTRACE_ON;
    - else
    - return -EINVAL;

    - return 0;
    + return -EINVAL;
    }
    early_param("kasan.stacktrace", early_kasan_flag_stacktrace);

    @@ -98,10 +94,8 @@ static int __init early_kasan_fault(char *arg)
    kasan_arg_fault = KASAN_ARG_FAULT_REPORT;
    else if (!strcmp(arg, "panic"))
    kasan_arg_fault = KASAN_ARG_FAULT_PANIC;
    - else
    - return -EINVAL;

    - return 0;
    + return -EINVAL;
    }
    early_param("kasan.fault", early_kasan_fault);
    \
     
     \ /
      Last update: 2020-11-13 18:53    [W:2.153 / U:0.692 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site