lkml.org 
[lkml]   [2019]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 41/66] misc: kgdbts: Fix restrict error
    Date
    From: Laura Abbott <labbott@redhat.com>

    [ Upstream commit fa0218ef733e6f247a1a3986e3eb12460064ac77 ]

    kgdbts current fails when compiled with restrict:

    drivers/misc/kgdbts.c: In function ‘configure_kgdbts’:
    drivers/misc/kgdbts.c:1070:2: error: ‘strcpy’ source argument is the same as destination [-Werror=restrict]
    strcpy(config, opt);
    ^~~~~~~~~~~~~~~~~~~

    As the error says, config is being used in both the source and destination.
    Refactor the code to avoid the extra copy and put the parsing closer to
    the actual location.

    Signed-off-by: Laura Abbott <labbott@redhat.com>
    Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/misc/kgdbts.c | 16 ++++++----------
    1 file changed, 6 insertions(+), 10 deletions(-)

    diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
    index bb3a76ad80da2..fc8cb855c6e66 100644
    --- a/drivers/misc/kgdbts.c
    +++ b/drivers/misc/kgdbts.c
    @@ -979,6 +979,12 @@ static void kgdbts_run_tests(void)
    int nmi_sleep = 0;
    int i;

    + verbose = 0;
    + if (strstr(config, "V1"))
    + verbose = 1;
    + if (strstr(config, "V2"))
    + verbose = 2;
    +
    ptr = strchr(config, 'F');
    if (ptr)
    fork_test = simple_strtol(ptr + 1, NULL, 10);
    @@ -1062,13 +1068,6 @@ static int kgdbts_option_setup(char *opt)
    return -ENOSPC;
    }
    strcpy(config, opt);
    -
    - verbose = 0;
    - if (strstr(config, "V1"))
    - verbose = 1;
    - if (strstr(config, "V2"))
    - verbose = 2;
    -
    return 0;
    }

    @@ -1080,9 +1079,6 @@ static int configure_kgdbts(void)

    if (!strlen(config) || isspace(config[0]))
    goto noconfig;
    - err = kgdbts_option_setup(config);
    - if (err)
    - goto noconfig;

    final_ack = 0;
    run_plant_and_detach_test(1);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-10 03:50    [W:4.222 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site