]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
kgdboc: Fix restrict error
authorLaura Abbott <labbott@redhat.com>
Mon, 10 Sep 2018 23:20:14 +0000 (16:20 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 8 Dec 2018 11:59:08 +0000 (12:59 +0100)
commit 2dd453168643d9475028cd867c57e65956a0f7f9 upstream.

There's an error when compiled with restrict:

drivers/tty/serial/kgdboc.c: In function ‘configure_kgdboc’:
drivers/tty/serial/kgdboc.c:137:2: error: ‘strcpy’ source argument is the same
as destination [-Werror=restrict]
  strcpy(config, opt);
  ^~~~~~~~~~~~~~~~~~~

As the error implies, this is from trying to use config as both source and
destination. Drop the call to the function where config is the argument
since nothing else happens in the function.

Signed-off-by: Laura Abbott <labbott@redhat.com>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/kgdboc.c

index f4d0ef69522534eb9acce80b2c5f7be91f28045d..464b71ed44b3c351044eda58b7263bc42deb06a0 100644 (file)
@@ -159,15 +159,13 @@ static int configure_kgdboc(void)
 {
        struct tty_driver *p;
        int tty_line = 0;
-       int err;
+       int err = -ENODEV;
        char *cptr = config;
        struct console *cons;
 
-       err = kgdboc_option_setup(config);
-       if (err || !strlen(config) || isspace(config[0]))
+       if (!strlen(config) || isspace(config[0]))
                goto noconfig;
 
-       err = -ENODEV;
        kgdboc_io_ops.is_console = 0;
        kgdb_tty_driver = NULL;