On Fri, Jun 07, 2019 at 03:05:27PM +0200, Martin Wilck wrote:
> More often than not, this means replacing strncpy() by strlcpy().
This depends on "libmultipath: add size argument to dm_get_uuid()" for
the the extra argument in the call to dm_get_uuid() from get_refwwid().
Otherwise, it looks fine.
-Ben
>
> Signed-off-by: Martin Wilck <mwilck@xxxxxxxx>
> ---
> libmpathpersist/mpath_persist.c | 8 ++++----
> libmultipath/configure.c | 7 ++++---
> libmultipath/discovery.c | 12 ++++++------
> libmultipath/dmparser.c | 20 +++++++++-----------
> libmultipath/util.c | 2 +-
> libmultipath/uxsock.c | 2 +-
> 6 files changed, 25 insertions(+), 26 deletions(-)
>
> diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
> index 599c5e9e..4abcaed5 100644
> --- a/libmpathpersist/mpath_persist.c
> +++ b/libmpathpersist/mpath_persist.c
> @@ -497,8 +497,8 @@ int mpath_prout_reg(struct multipath *mpp,int rq_servact, int rq_scope,
> if (k < count)
> continue;
> }
> - strncpy(thread[count].param.dev, pp->dev,
> - FILE_NAME_SIZE - 1);
> + strlcpy(thread[count].param.dev, pp->dev,
> + FILE_NAME_SIZE);
>
> if (count && (thread[count].param.paramp->sa_flags & MPATH_F_SPEC_I_PT_MASK)){
> /*
> @@ -686,8 +686,8 @@ int mpath_prout_rel(struct multipath *mpp,int rq_servact, int rq_scope,
> continue;
> }
>
> - strncpy(thread[count].param.dev, pp->dev,
> - FILE_NAME_SIZE - 1);
> + strlcpy(thread[count].param.dev, pp->dev,
> + FILE_NAME_SIZE);
> condlog (3, "%s: sending pr out command to %s", mpp->wwid, pp->dev);
> rc = pthread_create (&thread[count].id, &attr, mpath_prout_pthread_fn,
> (void *) (&thread[count].param));
> diff --git a/libmultipath/configure.c b/libmultipath/configure.c
> index af4d78de..dfee7d24 100644
> --- a/libmultipath/configure.c
> +++ b/libmultipath/configure.c
> @@ -73,7 +73,7 @@ int group_by_host_adapter(struct pathgroup *pgp, vector adapters)
> goto out;
> agp->pgp = pgp;
>
> - strncpy(agp->adapter_name, adapter_name1, SLOT_NAME_SIZE - 1);
> + strlcpy(agp->adapter_name, adapter_name1, SLOT_NAME_SIZE);
> store_adaptergroup(adapters, agp);
>
> /* create a new host port group
> @@ -667,7 +667,7 @@ select_action (struct multipath * mpp, vector curmp, int force_reload)
> if (!cmpp) {
> condlog(2, "%s: remove (wwid changed)", mpp->alias);
> dm_flush_map(mpp->alias);
> - strncpy(cmpp_by_name->wwid, mpp->wwid, WWID_SIZE - 1);
> + strlcpy(cmpp_by_name->wwid, mpp->wwid, WWID_SIZE);
> drop_multipath(curmp, cmpp_by_name->wwid, KEEP_PATHS);
> mpp->action = ACT_CREATE;
> condlog(3, "%s: set ACT_CREATE (map wwid change)",
> @@ -1451,7 +1451,8 @@ int get_refwwid(enum mpath_cmds cmd, char *dev, enum devtypes dev_type,
>
> conf = get_multipath_config();
> pthread_cleanup_push(put_multipath_config, conf);
> - if (((dm_get_uuid(dev, tmpwwid)) == 0) && (strlen(tmpwwid))) {
> + if (((dm_get_uuid(dev, tmpwwid, WWID_SIZE)) == 0)
> + && (strlen(tmpwwid))) {
> refwwid = tmpwwid;
> goto check;
> }
> diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
> index 51ca2306..407e64a0 100644
> --- a/libmultipath/discovery.c
> +++ b/libmultipath/discovery.c
> @@ -297,8 +297,8 @@ sysfs_get_timeout(const struct path *pp, unsigned int *timeout)
> return 1;
> }
>
> -int
> -sysfs_get_tgt_nodename (struct path *pp, char * node)
> +static int
> +sysfs_get_tgt_nodename(struct path *pp, char *node)
> {
> const char *tgtname, *value;
> struct udev_device *parent, *tgtdev;
> @@ -322,7 +322,7 @@ sysfs_get_tgt_nodename (struct path *pp, char * node)
> if (tgtid >= 0) {
> pp->sg_id.proto_id = SCSI_PROTOCOL_SAS;
> pp->sg_id.transport_id = tgtid;
> - strncpy(node, value, NODE_NAME_SIZE);
> + strlcpy(node, value, NODE_NAME_SIZE);
> return 0;
> }
> }
> @@ -334,7 +334,7 @@ sysfs_get_tgt_nodename (struct path *pp, char * node)
> if (value && !strcmp(value, "usb")) {
> pp->sg_id.proto_id = SCSI_PROTOCOL_UNSPEC;
> tgtname = udev_device_get_sysname(tgtdev);
> - strncpy(node, tgtname, strlen(tgtname));
> + strlcpy(node, tgtname, NODE_NAME_SIZE);
> condlog(3, "%s: skip USB device %s", pp->dev, node);
> return 1;
> }
> @@ -361,7 +361,7 @@ sysfs_get_tgt_nodename (struct path *pp, char * node)
> if (value) {
> pp->sg_id.proto_id = SCSI_PROTOCOL_FCP;
> pp->sg_id.transport_id = tgtid;
> - strncpy(node, value, NODE_NAME_SIZE);
> + strlcpy(node, value, NODE_NAME_SIZE);
> udev_device_unref(tgtdev);
> return 0;
> } else
> @@ -390,7 +390,7 @@ sysfs_get_tgt_nodename (struct path *pp, char * node)
> if (value) {
> pp->sg_id.proto_id = SCSI_PROTOCOL_ISCSI;
> pp->sg_id.transport_id = tgtid;
> - strncpy(node, value, NODE_NAME_SIZE);
> + strlcpy(node, value, NODE_NAME_SIZE);
> udev_device_unref(tgtdev);
> return 0;
> }
> diff --git a/libmultipath/dmparser.c b/libmultipath/dmparser.c
> index a8b0b71a..b856a07f 100644
> --- a/libmultipath/dmparser.c
> +++ b/libmultipath/dmparser.c
> @@ -308,11 +308,11 @@ int disassemble_map(vector pathvec, char *params, struct multipath *mpp,
> if (!pp)
> goto out1;
>
> - strncpy(pp->dev_t, word, BLK_DEV_SIZE - 1);
> - strncpy(pp->dev, devname, FILE_NAME_SIZE - 1);
> + strlcpy(pp->dev_t, word, BLK_DEV_SIZE);
> + strlcpy(pp->dev, devname, FILE_NAME_SIZE);
> if (strlen(mpp->wwid)) {
> - strncpy(pp->wwid, mpp->wwid,
> - WWID_SIZE - 1);
> + strlcpy(pp->wwid, mpp->wwid,
> + WWID_SIZE);
> }
> /* Only call this in multipath client mode */
> if (!is_daemon && store_path(pathvec, pp))
> @@ -320,8 +320,8 @@ int disassemble_map(vector pathvec, char *params, struct multipath *mpp,
> } else {
> if (!strlen(pp->wwid) &&
> strlen(mpp->wwid))
> - strncpy(pp->wwid, mpp->wwid,
> - WWID_SIZE - 1);
> + strlcpy(pp->wwid, mpp->wwid,
> + WWID_SIZE);
> }
> FREE(word);
>
> @@ -333,23 +333,21 @@ int disassemble_map(vector pathvec, char *params, struct multipath *mpp,
> * in the get_dm_mpvec() code path
> */
> if (!strlen(mpp->wwid))
> - strncpy(mpp->wwid, pp->wwid,
> - WWID_SIZE - 1);
> + strlcpy(mpp->wwid, pp->wwid, WWID_SIZE);
>
> /*
> * Update wwid for paths which may not have been
> * active at the time the getuid callout was run
> */
> else if (!strlen(pp->wwid))
> - strncpy(pp->wwid, mpp->wwid,
> - WWID_SIZE - 1);
> + strlcpy(pp->wwid, mpp->wwid, WWID_SIZE);
>
> /*
> * Do not allow in-use patch to change wwid
> */
> else if (strcmp(pp->wwid, mpp->wwid) != 0) {
> condlog(0, "%s: path wwid appears to have changed. Using map wwid.\n", pp->dev_t);
> - strncpy(pp->wwid, mpp->wwid, WWID_SIZE);
> + strlcpy(pp->wwid, mpp->wwid, WWID_SIZE);
> }
>
> pgp->id ^= (long)pp;
> diff --git a/libmultipath/util.c b/libmultipath/util.c
> index 5b838d51..8a4be787 100644
> --- a/libmultipath/util.c
> +++ b/libmultipath/util.c
> @@ -188,7 +188,7 @@ int devt2devname(char *devname, int devname_len, char *devt)
> return 1;
> }
> p++;
> - strncpy(devname, p, devname_len);
> + strlcpy(devname, p, devname_len);
> return 0;
> }
> }
> diff --git a/libmultipath/uxsock.c b/libmultipath/uxsock.c
> index 7e5a1449..1ec4549b 100644
> --- a/libmultipath/uxsock.c
> +++ b/libmultipath/uxsock.c
> @@ -67,7 +67,7 @@ int ux_socket_listen(const char *name)
> addr.sun_family = AF_LOCAL;
> addr.sun_path[0] = '\0';
> len = strlen(name) + 1 + sizeof(sa_family_t);
> - strncpy(&addr.sun_path[1], name, len);
> + strncpy(&addr.sun_path[1], name, sizeof(addr.sun_path) - 1);
>
> if (bind(fd, (struct sockaddr *)&addr, len) == -1) {
> condlog(3, "Couldn't bind to ux_socket, error %d", errno);
> --
> 2.21.0
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
