On Fri, 2018-09-21 at 18:05 -0500, Benjamin Marzinski wrote: > 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. > > Signed-off-by: Benjamin Marzinski <[email protected]>
Reviewed-by: Martin Wilck <[email protected]> > --- > multipathd/cli_handlers.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c > index 5682b5c..bb16472 100644 > --- a/multipathd/cli_handlers.c > +++ b/multipathd/cli_handlers.c > @@ -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) { -- Dr. Martin Wilck <[email protected]>, Tel. +49 (0)911 74053 2107 SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
