On Fri, 2018-09-21 at 18:05 -0500, Benjamin Marzinski wrote: > In update_multipath(), conf is set again in a couple of lines, and > nothing uses it before then, so there's no point in setting it twice. > Also, in ev_remove_path(), strncpy() could end up unterminated, so > use strlcpy() instead. > > Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx> Reviewed-by: Martin Wilck <mwilck@xxxxxxxx> > --- > multipathd/main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/multipathd/main.c b/multipathd/main.c > index cc493c1..125a805 100644 > --- a/multipathd/main.c > +++ b/multipathd/main.c > @@ -429,7 +429,7 @@ int update_multipath (struct vectors *vecs, char > *mapname, int reset) > continue; > > if (pp->state != PATH_DOWN) { > - struct config *conf = > get_multipath_config(); > + struct config *conf; > int oldstate = pp->state; > int checkint; > > @@ -1096,7 +1096,7 @@ ev_remove_path (struct path *pp, struct vectors > * vecs, int need_do_map) > /* > * flush_map will fail if the device is open > */ > - strncpy(alias, mpp->alias, WWID_SIZE); > + strlcpy(alias, mpp->alias, WWID_SIZE); > if (mpp->flush_on_last_del == FLUSH_ENABLED) { > condlog(2, "%s Last path deleted, > disabling queueing", mpp->alias); > mpp->retry_tick = 0; -- Dr. Martin Wilck <mwilck@xxxxxxxx>, 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 dm-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/dm-devel