multipathd: function return value tweaks
authorBenjamin Marzinski <bmarzins@redhat.com>
Tue, 9 Oct 2018 23:03:11 +0000 (18:03 -0500)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Wed, 10 Oct 2018 06:09:42 +0000 (08:09 +0200)
In cli_add_map() the return value of get_refwwid is never used, and
refwwid is checked to see if the function returned successfully, so the
return value doesn't need to be saved.

In resize_map, if setup_map fails, multipathd shouldn't attempt to
create the device with resulting params string. It should just fail
instead. Found by coverity.

Reviewed-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
multipathd/cli_handlers.c

index 5682b5c..bb16472 100644 (file)
@@ -796,8 +796,8 @@ cli_add_map (void * v, char ** reply, int * len, void * data)
                if (!alias && !count) {
                        condlog(2, "%s: mapname not found for %d:%d",
                                param, major, minor);
-                       rc = get_refwwid(CMD_NONE, param, DEV_DEVMAP,
-                                        vecs->pathvec, &refwwid);
+                       get_refwwid(CMD_NONE, param, DEV_DEVMAP,
+                                   vecs->pathvec, &refwwid);
                        if (refwwid) {
                                if (coalesce_paths(vecs, NULL, refwwid,
                                                   FORCE_RELOAD_NONE, CMD_NONE))
@@ -881,7 +881,12 @@ int resize_map(struct multipath *mpp, unsigned long long size,
 
        mpp->size = size;
        update_mpp_paths(mpp, vecs->pathvec);
-       setup_map(mpp, params, PARAMS_SIZE, vecs);
+       if (setup_map(mpp, params, PARAMS_SIZE, vecs) != 0) {
+               condlog(0, "%s: failed to setup map for resize : %s",
+                       mpp->alias, strerror(errno));
+               mpp->size = orig_size;
+               return 1;
+       }
        mpp->action = ACT_RESIZE;
        mpp->force_udev_reload = 1;
        if (domap(mpp, params, 1) <= 0) {