multipathd: valgrind fixes

valgrind complained about uninitialized memory.
As usual, valgrind was right, although the memory never was
actually referenced.

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 2da8d81..d31ec46 100644 (file)
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -320,7 +320,7 @@ static void
 sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
 {
        struct udev_device *rport_dev = NULL;
 sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
 {
        struct udev_device *rport_dev = NULL;

-       char value[11];
+       char value[16];

        char rport_id[32];
        unsigned long long tmo = 0;
        int ret;
        char rport_id[32];
        unsigned long long tmo = 0;
        int ret;


@@ -348,7 +348,7 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
         * then set fast_io_fail, and _then_ set dev_loss_tmo
         * to the correct value.
         */
         * then set fast_io_fail, and _then_ set dev_loss_tmo
         * to the correct value.
         */

-       value[0] = '\0';
+       memset(value, 0, 16);

        if (mpp->fast_io_fail != MP_FAST_IO_FAIL_UNSET &&
            mpp->fast_io_fail != MP_FAST_IO_FAIL_ZERO &&
            mpp->fast_io_fail != MP_FAST_IO_FAIL_OFF) {
        if (mpp->fast_io_fail != MP_FAST_IO_FAIL_UNSET &&
            mpp->fast_io_fail != MP_FAST_IO_FAIL_ZERO &&
            mpp->fast_io_fail != MP_FAST_IO_FAIL_OFF) {


@@ -366,17 +366,18 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
                        goto out;
                }
                if (mpp->fast_io_fail >= tmo) {
                        goto out;
                }
                if (mpp->fast_io_fail >= tmo) {

-                       snprintf(value, 11, "%u", mpp->fast_io_fail);
+                       snprintf(value, 16, "%u", mpp->fast_io_fail);

                }
        } else if (mpp->dev_loss > 600) {
                condlog(3, "%s: limiting dev_loss_tmo to 600, since "
                        "fast_io_fail is not set", rport_id);
                }
        } else if (mpp->dev_loss > 600) {
                condlog(3, "%s: limiting dev_loss_tmo to 600, since "
                        "fast_io_fail is not set", rport_id);

-               snprintf(value, 11, "%u", 600);
+               snprintf(value, 16, "%u", 600);

        } else {
        } else {

-               snprintf(value, 11, "%u", mpp->dev_loss);
+               snprintf(value, 16, "%u", mpp->dev_loss);

        }
        if (strlen(value)) {
        }
        if (strlen(value)) {

-               ret = sysfs_attr_set_value(rport_dev, "dev_loss_tmo", value, 11);
+               ret = sysfs_attr_set_value(rport_dev, "dev_loss_tmo",
+                                          value, strlen(value));

                if (ret <= 0) {
                        if (ret == -EBUSY)
                                condlog(3, "%s: rport blocked", rport_id);
                if (ret <= 0) {
                        if (ret == -EBUSY)
                                condlog(3, "%s: rport blocked", rport_id);


@@ -392,9 +393,9 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
                else if (mpp->fast_io_fail == MP_FAST_IO_FAIL_ZERO)
                        sprintf(value, "0");
                else
                else if (mpp->fast_io_fail == MP_FAST_IO_FAIL_ZERO)
                        sprintf(value, "0");
                else

-                       snprintf(value, 11, "%u", mpp->fast_io_fail);
+                       snprintf(value, 16, "%u", mpp->fast_io_fail);

                ret = sysfs_attr_set_value(rport_dev, "fast_io_fail_tmo",
                ret = sysfs_attr_set_value(rport_dev, "fast_io_fail_tmo",

-                                          value, 11);
+                                          value, strlen(value));

                if (ret <= 0) {
                        if (ret == -EBUSY)
                                condlog(3, "%s: rport blocked", rport_id);
                if (ret <= 0) {
                        if (ret == -EBUSY)
                                condlog(3, "%s: rport blocked", rport_id);


@@ -404,9 +405,9 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
                }
        }
        if (tmo > 0) {
                }
        }
        if (tmo > 0) {

-               snprintf(value, 11, "%u", mpp->dev_loss);
+               snprintf(value, 16, "%u", mpp->dev_loss);

                ret = sysfs_attr_set_value(rport_dev, "dev_loss_tmo",
                ret = sysfs_attr_set_value(rport_dev, "dev_loss_tmo",

-                                          value, 11);
+                                          value, strlen(value));

                if (ret <= 0) {
                        if (ret == -EBUSY)
                                condlog(3, "%s: rport blocked", rport_id);
                if (ret <= 0) {
                        if (ret == -EBUSY)
                                condlog(3, "%s: rport blocked", rport_id);


@@ -808,6 +809,9 @@ cciss_sysfs_pathinfo (struct path * pp)
 static int
 common_sysfs_pathinfo (struct path * pp)
 {
 static int
 common_sysfs_pathinfo (struct path * pp)
 {

+       if (!pp)
+               return 1;
+

        if (!pp->udev) {
                condlog(4, "%s: udev not initialised", pp->dev);
                return 1;
        if (!pp->udev) {
                condlog(4, "%s: udev not initialised", pp->dev);
                return 1;


@@ -1059,6 +1063,9 @@ pathinfo (struct path *pp, vector hwtable, int mask)
 {
        int path_state;
 
 {
        int path_state;
 

+       if (!pp)
+               return 1;
+

        condlog(3, "%s: mask = 0x%x", pp->dev, mask);
 
        /*
        condlog(3, "%s: mask = 0x%x", pp->dev, mask);
 
        /*

diff --git a/libmultipath/sysfs.c b/libmultipath/sysfs.c
index 0670e0a..8ba27d4 100644 (file)
--- a/libmultipath/sysfs.c
+++ b/libmultipath/sysfs.c
@@ -102,7 +102,7 @@ ssize_t sysfs_attr_set_value(struct udev_device *dev, const char *attr_name,
        int fd;
        ssize_t size = -1;
 
        int fd;
        ssize_t size = -1;
 

-       if (!dev || !attr_name || !value)
+       if (!dev || !attr_name || !value || !value_len)

                return 0;
 
        snprintf(devpath, PATH_SIZE, "%s/%s", udev_device_get_syspath(dev),
                return 0;
 
        snprintf(devpath, PATH_SIZE, "%s/%s", udev_device_get_syspath(dev),


@@ -152,9 +152,10 @@ sysfs_get_size (struct path *pp, unsigned long long * size)
        char attr[255];
        int r;
 
        char attr[255];
        int r;
 

-       if (!pp->udev)
+       if (!pp->udev || !size)

                return 1;
 
                return 1;
 

+       attr[0] = '\0';

        if (sysfs_attr_get_value(pp->udev, "size", attr, 255) == 0) {
                condlog(3, "%s: No size attribute in sysfs", pp->dev);
                return 1;
        if (sysfs_attr_get_value(pp->udev, "size", attr, 255) == 0) {
                condlog(3, "%s: No size attribute in sysfs", pp->dev);
                return 1;


@@ -164,6 +165,7 @@ sysfs_get_size (struct path *pp, unsigned long long * size)
 
        if (r != 1) {
                condlog(3, "%s: Cannot parse size attribute", pp->dev);
 
        if (r != 1) {
                condlog(3, "%s: Cannot parse size attribute", pp->dev);

+               *size = 0;

                return 1;
        }
 
                return 1;
        }