LU-10141 llapi: integer overflow in llapi_changelog_start

[fs/lustre-release.git] / lustre / utils / lustre_lfsck.c

diff --git a/lustre/utils/lustre_lfsck.c b/lustre/utils/lustre_lfsck.c
index 2c0f369..2524f99 100644 (file)
--- a/lustre/utils/lustre_lfsck.c
+++ b/lustre/utils/lustre_lfsck.c
@@ -40,49 +40,47 @@
 #include <time.h>
 
 #include "obdctl.h"
+#include "lustreapi_internal.h"
 
-#include <lustre/lustre_lfsck_user.h>
-#include <lnet/lnetctl.h>
-#include <lustre_ioctl.h>
+#include <linux/lnet/lnetctl.h>
+#include <linux/lustre/lustre_ioctl.h>
+#include <linux/lustre/lustre_lfsck_user.h>
 /* Needs to be last to avoid clashes */
 #include <libcfs/util/ioctl.h>
 #include <libcfs/util/param.h>
 
 static struct option long_opt_start[] = {
-       {"device",              required_argument, 0, 'M'},
-       {"all",                 no_argument,       0, 'A'},
-       {"create_ostobj",       optional_argument, 0, 'c'},
-       {"create-ostobj",       optional_argument, 0, 'c'},
-       {"create_mdtobj",       optional_argument, 0, 'C'},
-       {"create-mdtobj",       optional_argument, 0, 'C'},
-       {"delay_create_ostobj", optional_argument, 0, 'd'},
-       {"delay-create-ostobj", optional_argument, 0, 'd'},
-       {"error",               required_argument, 0, 'e'},
-       {"help",                no_argument,       0, 'h'},
-       {"dryrun",              optional_argument, 0, 'n'},
-       {"orphan",              no_argument,       0, 'o'},
-       {"reset",               no_argument,       0, 'r'},
-       {"speed",               required_argument, 0, 's'},
-       {"type",                required_argument, 0, 't'},
-       {"window_size",         required_argument, 0, 'w'},
-       {"window-size",         required_argument, 0, 'w'},
-       {0,                     0,                 0,  0 }
-};
+{ .val = 'A',  .name = "all",                  .has_arg = no_argument },
+{ .val = 'c',  .name = "create_ostobj",        .has_arg = optional_argument },
+{ .val = 'c',  .name = "create-ostobj",        .has_arg = optional_argument },
+{ .val = 'C',  .name = "create_mdtobj",        .has_arg = optional_argument },
+{ .val = 'C',  .name = "create-mdtobj",        .has_arg = optional_argument },
+{ .val = 'd',  .name = "delay_create_ostobj",  .has_arg = optional_argument },
+{ .val = 'd',  .name = "delay-create-ostobj",  .has_arg = optional_argument },
+{ .val = 'e',  .name = "error",                .has_arg = required_argument },
+{ .val = 'h',  .name = "help",                 .has_arg = no_argument },
+{ .val = 'M',  .name = "device",               .has_arg = required_argument },
+{ .val = 'n',  .name = "dryrun",               .has_arg = optional_argument },
+{ .val = 'o',  .name = "orphan",               .has_arg = no_argument },
+{ .val = 'r',  .name = "reset",                .has_arg = no_argument },
+{ .val = 's',  .name = "speed",                .has_arg = required_argument },
+{ .val = 't',  .name = "type",                 .has_arg = required_argument },
+{ .val = 'w',  .name = "window_size",          .has_arg = required_argument },
+{ .val = 'w',  .name = "window-size",          .has_arg = required_argument },
+{ .name = NULL } };
 
 static struct option long_opt_stop[] = {
-       {"device",      required_argument, 0, 'M'},
-       {"all",         no_argument,       0, 'A'},
-       {"help",        no_argument,       0, 'h'},
-       {0,             0,                 0,  0 }
-};
+       { .val = 'A',   .name = "all",          .has_arg = no_argument },
+       { .val = 'h',   .name = "help",         .has_arg = no_argument },
+       { .val = 'M',   .name = "device",       .has_arg = required_argument },
+       { .name = NULL } };
 
 static struct option long_opt_query[] = {
-       {"device",      required_argument, 0, 'M'},
-       {"type",        required_argument, 0, 't'},
-       {"help",        no_argument,       0, 'h'},
-       {"wait",        no_argument,       0, 'w'},
-       {0,             0,                 0,  0 }
-};
+       { .val = 'h',   .name = "help",         .has_arg = no_argument },
+       { .val = 'M',   .name = "device",       .has_arg = required_argument },
+       { .val = 't',   .name = "type",         .has_arg = required_argument },
+       { .val = 'w',   .name = "wait",         .has_arg = no_argument },
+       { .name = NULL } };
 
 struct lfsck_type_name {
        char            *ltn_name;
@@ -90,13 +88,12 @@ struct lfsck_type_name {
 };
 
 static struct lfsck_type_name lfsck_types_names[] = {
-       { "scrub",      LFSCK_TYPE_SCRUB },
-       { "layout",     LFSCK_TYPE_LAYOUT },
-       { "namespace",  LFSCK_TYPE_NAMESPACE },
-       { "default",    LFSCK_TYPES_DEF },
-       { "all",        LFSCK_TYPES_SUPPORTED },
-       { NULL,         0 }
-};
+       { .ltn_name = "all",            .ltn_type = LFSCK_TYPES_SUPPORTED },
+       { .ltn_name = "default",        .ltn_type = LFSCK_TYPES_DEF },
+       { .ltn_name = "layout",         .ltn_type = LFSCK_TYPE_LAYOUT },
+       { .ltn_name = "namespace",      .ltn_type = LFSCK_TYPE_NAMESPACE },
+       { .ltn_name = "scrub",          .ltn_type = LFSCK_TYPE_SCRUB },
+       { .ltn_name = NULL } };
 
 static enum lfsck_type lfsck_name2type(const char *name)
 {
@@ -240,12 +237,18 @@ static int lfsck_get_dev_name(struct obd_ioctl_data *data, char *device,
        }
 
        ptr = strrchr(param.gl_pathv[0], '-');
-       LASSERT(ptr != NULL);
+       if (ptr == NULL) {
+               rc = -EINVAL;
+               goto out;
+       }
 
        for (i = 1; i < param.gl_pathc; i++) {
                char *ptr2 = strrchr(param.gl_pathv[i], '-');
 
-               LASSERT(ptr2 != NULL);
+               if (ptr2 == NULL) {
+                       rc = -EINVAL;
+                       goto out;
+               }
 
                if ((ptr - param.gl_pathv[0]) != (ptr2 - param.gl_pathv[i]) ||
                    strncmp(param.gl_pathv[0], param.gl_pathv[i],
@@ -274,7 +277,7 @@ int jt_lfsck_start(int argc, char **argv)
        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
        char device[MAX_OBD_NAME];
        struct lfsck_start start;
-       char *optstring = "Ac::C::d::e:hM:n::ors:t:w:";
+       char *short_opts = "Ac::C::d::e:hM:n::ors:t:w:";
        int opt, index, rc, val, i;
 
        memset(&data, 0, sizeof(data));
@@ -286,7 +289,7 @@ int jt_lfsck_start(int argc, char **argv)
        /* Reset the 'optind' for the case of getopt_long() called multiple
         * times under the same lctl. */
        optind = 0;
-       while ((opt = getopt_long(argc, argv, optstring, long_opt_start,
+       while ((opt = getopt_long(argc, argv, short_opts, long_opt_start,
                                  &index)) != EOF) {
                switch (opt) {
                case 'A':
@@ -464,7 +467,7 @@ int jt_lfsck_stop(int argc, char **argv)
        char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
        char device[MAX_OBD_NAME];
        struct lfsck_stop stop;
-       char *optstring = "AhM:";
+       char *short_opts = "AhM:";
        int opt, index, rc;
 
        memset(&data, 0, sizeof(data));
@@ -474,7 +477,7 @@ int jt_lfsck_stop(int argc, char **argv)
        /* Reset the 'optind' for the case of getopt_long() called multiple
         * times under the same lctl. */
        optind = 0;
-       while ((opt = getopt_long(argc, argv, optstring, long_opt_stop,
+       while ((opt = getopt_long(argc, argv, short_opts, long_opt_stop,
                                  &index)) != EOF) {
                switch (opt) {
                case 'A':