aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/kgdbts.c
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2018-09-11 13:44:03 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-25 14:21:02 -0400
commitfa0218ef733e6f247a1a3986e3eb12460064ac77 (patch)
tree1a9163c405afa30493594a01777628af53b86edd /drivers/misc/kgdbts.c
parent85dc2c65e6c975baaf36ea30f2ccc0a36a8c8add (diff)
misc: kgdbts: Fix restrict error
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>
Diffstat (limited to 'drivers/misc/kgdbts.c')
-rw-r--r--drivers/misc/kgdbts.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 6193270e7b3d..de20bdaa148d 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -985,6 +985,12 @@ static void kgdbts_run_tests(void)
985 int nmi_sleep = 0; 985 int nmi_sleep = 0;
986 int i; 986 int i;
987 987
988 verbose = 0;
989 if (strstr(config, "V1"))
990 verbose = 1;
991 if (strstr(config, "V2"))
992 verbose = 2;
993
988 ptr = strchr(config, 'F'); 994 ptr = strchr(config, 'F');
989 if (ptr) 995 if (ptr)
990 fork_test = simple_strtol(ptr + 1, NULL, 10); 996 fork_test = simple_strtol(ptr + 1, NULL, 10);
@@ -1068,13 +1074,6 @@ static int kgdbts_option_setup(char *opt)
1068 return -ENOSPC; 1074 return -ENOSPC;
1069 } 1075 }
1070 strcpy(config, opt); 1076 strcpy(config, opt);
1071
1072 verbose = 0;
1073 if (strstr(config, "V1"))
1074 verbose = 1;
1075 if (strstr(config, "V2"))
1076 verbose = 2;
1077
1078 return 0; 1077 return 0;
1079} 1078}
1080 1079
@@ -1086,9 +1085,6 @@ static int configure_kgdbts(void)
1086 1085
1087 if (!strlen(config) || isspace(config[0])) 1086 if (!strlen(config) || isspace(config[0]))
1088 goto noconfig; 1087 goto noconfig;
1089 err = kgdbts_option_setup(config);
1090 if (err)
1091 goto noconfig;
1092 1088
1093 final_ack = 0; 1089 final_ack = 0;
1094 run_plant_and_detach_test(1); 1090 run_plant_and_detach_test(1);