Whamcloud - gitweb
LU-13746 utils: check argument logname presence in llog_print 63/39263/3
authorEtienne AUJAMES <eaujames@ddn.com>
Fri, 3 Jul 2020 08:17:29 +0000 (10:17 +0200)
committerOleg Drokin <green@whamcloud.com>
Thu, 26 Nov 2020 09:25:55 +0000 (09:25 +0000)
Correction of segfault in llog_print when no logname specified.
example: lctl --device MGS llog_print

Signed-off-by: Etienne AUJAMES <eaujames@ddn.com>
Change-Id: I03a6c08dfc73ff8cb5861d162e21ce5aa581e197
Reviewed-on: https://review.whamcloud.com/39263
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
lustre/utils/obd.c

index 1b033fd..d3762de 100644 (file)
@@ -2983,7 +2983,7 @@ static int llog_parse_catalog_start_end(int *argc, char **argv[],
        if (*argc >= 1) {
                if (*catalog) {
                        fprintf(stderr,
-                               "%s: catalog is set, unknown argument '%s'\n",
+                               "%s: logname is set, unknown argument '%s'\n",
                                cmd, (*argv)[0]);
                        return CMD_HELP;
                }
@@ -2992,6 +2992,11 @@ static int llog_parse_catalog_start_end(int *argc, char **argv[],
                (*argv)++;
        }
 
+       if (*catalog == NULL) {
+               fprintf(stderr, "%s: no logname specified\n", cmd);
+               return CMD_HELP;
+       }
+
        if (*argc >= 1) {
                if (*start != 1) {
                        fprintf(stderr,