Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fdf70ac authored Jun 25, 2015 by Sagi Grimberg Committed by Doug Ledford Jul 14, 2015

IB/srp: Avoid using uninitialized variable



We might return res which is not initialized. Also
reduce code duplication by exporting srp_parse_tmo so
srp_tmo_set can reuse it.

Detected by Coverity.

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Jenny Falkovich <jennyf@mellanox.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

parent b356c1c1

drivers/infiniband/ulp/srp/ib_srp.c

+4 −7

Original line number	Original line	Diff line number	Diff line
	@@ -161,13 +161,10 @@ static int srp_tmo_set(const char val, const struct kernel_param kp)
	{		{
	int tmo, res;		int tmo, res;

	if (strncmp(val, "off", 3) != 0) {		res = srp_parse_tmo(&tmo, val);
	res = kstrtoint(val, 0, &tmo);
	if (res)		if (res)
	goto out;		goto out;
	} else {
	tmo = -1;
	}
	if (kp->arg == &srp_reconnect_delay)		if (kp->arg == &srp_reconnect_delay)
	res = srp_tmo_valid(tmo, srp_fast_io_fail_tmo,		res = srp_tmo_valid(tmo, srp_fast_io_fail_tmo,
	srp_dev_loss_tmo);		srp_dev_loss_tmo);

drivers/scsi/scsi_transport_srp.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -203,7 +203,7 @@ static ssize_t srp_show_tmo(char *buf, int tmo)
	return tmo >= 0 ? sprintf(buf, "%d\n", tmo) : sprintf(buf, "off\n");		return tmo >= 0 ? sprintf(buf, "%d\n", tmo) : sprintf(buf, "off\n");
	}		}

	static int srp_parse_tmo(int tmo, const char buf)		int srp_parse_tmo(int tmo, const char buf)
	{		{
	int res = 0;		int res = 0;

	@@ -214,6 +214,7 @@ static int srp_parse_tmo(int tmo, const char buf)

	return res;		return res;
	}		}
			EXPORT_SYMBOL(srp_parse_tmo);

	static ssize_t show_reconnect_delay(struct device *dev,		static ssize_t show_reconnect_delay(struct device *dev,
	struct device_attribute attr, char buf)		struct device_attribute attr, char buf)

include/scsi/scsi_transport_srp.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -119,6 +119,7 @@ extern struct srp_rport srp_rport_add(struct Scsi_Host ,
	extern void srp_rport_del(struct srp_rport *);		extern void srp_rport_del(struct srp_rport *);
	extern int srp_tmo_valid(int reconnect_delay, int fast_io_fail_tmo,		extern int srp_tmo_valid(int reconnect_delay, int fast_io_fail_tmo,
	int dev_loss_tmo);		int dev_loss_tmo);
			int srp_parse_tmo(int tmo, const char buf);
	extern int srp_reconnect_rport(struct srp_rport *rport);		extern int srp_reconnect_rport(struct srp_rport *rport);
	extern void srp_start_tl_fail_timers(struct srp_rport *rport);		extern void srp_start_tl_fail_timers(struct srp_rport *rport);
	extern void srp_remove_host(struct Scsi_Host *);		extern void srp_remove_host(struct Scsi_Host *);