All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Gunthorpe <jgg@nvidia.com>
To: <linux-rdma@vger.kernel.org>
Subject: [PATCH 1/4] libibumad: Check for error returns in get_port()
Date: Mon, 16 Nov 2020 16:16:13 -0400	[thread overview]
Message-ID: <1-v1-f03f70229014+144-fix_lto_jgg@nvidia.com> (raw)
In-Reply-To: <0-v1-f03f70229014+144-fix_lto_jgg@nvidia.com>

Stronger control flow analysis on GCC 10 with LTO detects:

../libibumad/umad.c: In function 'get_port':
../libibumad/umad.c:208:20: error: 'val' may be used uninitialized in this function [-Werror=maybe-uninitialized]
  208 |   port->pkeys[idx] = val;

Caused by ignoring the return code from sys_read_uint()

Reorganize the goto unwind so it makes sense and check all the calls to
sys_read_uint().

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
 libibumad/umad.c | 49 ++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/libibumad/umad.c b/libibumad/umad.c
index 90b8c0ce409c2e..b23b345a4ca299 100644
--- a/libibumad/umad.c
+++ b/libibumad/umad.c
@@ -148,7 +148,7 @@ static int get_port(const char *ca_name, const char *dir, int portnum, umad_port
 {
 	char port_dir[256];
 	union umad_gid gid;
-	struct dirent **namelist = NULL;
+	struct dirent **namelist;
 	int i, len, num_pkeys = 0;
 	uint32_t capmask;
 
@@ -158,23 +158,24 @@ static int get_port(const char *ca_name, const char *dir, int portnum, umad_port
 
 	len = snprintf(port_dir, sizeof(port_dir), "%s/%d", dir, portnum);
 	if (len < 0 || len > sizeof(port_dir))
-		goto clean;
+		return -EIO;
 
 	if (sys_read_uint(port_dir, SYS_PORT_LMC, &port->lmc) < 0)
-		goto clean;
+		return -EIO;
 	if (sys_read_uint(port_dir, SYS_PORT_SMLID, &port->sm_lid) < 0)
-		goto clean;
+		return -EIO;
 	if (sys_read_uint(port_dir, SYS_PORT_SMSL, &port->sm_sl) < 0)
-		goto clean;
+		return -EIO;
 	if (sys_read_uint(port_dir, SYS_PORT_LID, &port->base_lid) < 0)
-		goto clean;
+		return -EIO;
 	if (sys_read_uint(port_dir, SYS_PORT_STATE, &port->state) < 0)
-		goto clean;
+		return -EIO;
 	if (sys_read_uint(port_dir, SYS_PORT_PHY_STATE, &port->phys_state) < 0)
-		goto clean;
-	sys_read_uint(port_dir, SYS_PORT_RATE, &port->rate);
+		return -EIO;
+	if (sys_read_uint(port_dir, SYS_PORT_RATE, &port->rate) < 0)
+		return -EIO;
 	if (sys_read_uint(port_dir, SYS_PORT_CAPMASK, &capmask) < 0)
-		goto clean;
+		return -EIO;
 
 	if (sys_read_string(port_dir, SYS_PORT_LINK_LAYER,
 	    port->link_layer, UMAD_CA_NAME_LEN) < 0)
@@ -184,7 +185,7 @@ static int get_port(const char *ca_name, const char *dir, int portnum, umad_port
 	port->capmask = htobe32(capmask);
 
 	if (sys_read_gid(port_dir, SYS_PORT_GID, &gid) < 0)
-		goto clean;
+		return -EIO;
 
 	port->gid_prefix = gid.global.subnet_prefix;
 	port->port_guid = gid.global.interface_id;
@@ -194,37 +195,37 @@ static int get_port(const char *ca_name, const char *dir, int portnum, umad_port
 	if (num_pkeys <= 0) {
 		IBWARN("no pkeys found for %s:%u (at dir %s)...",
 		       port->ca_name, port->portnum, port_dir);
-		goto clean;
+		return -EIO;
 	}
 	port->pkeys = calloc(num_pkeys, sizeof(port->pkeys[0]));
 	if (!port->pkeys) {
 		IBWARN("get_port: calloc failed: %s", strerror(errno));
-		goto clean;
+		goto clean_names;
 	}
 	for (i = 0; i < num_pkeys; i++) {
 		unsigned idx, val;
+
 		idx = strtoul(namelist[i]->d_name, NULL, 0);
-		sys_read_uint(port_dir, namelist[i]->d_name, &val);
+		if (sys_read_uint(port_dir, namelist[i]->d_name, &val) < 0)
+			goto clean_pkeys;
 		port->pkeys[idx] = val;
-		free(namelist[i]);
 	}
 	port->pkeys_size = num_pkeys;
+	for (i = 0; i < num_pkeys; i++)
+		free(namelist[i]);
 	free(namelist);
-	namelist = NULL;
 	port_dir[len] = '\0';
 
 	/* FIXME: handle gids */
 
 	return 0;
 
-clean:
-	if (namelist) {
-		for (i = 0; i < num_pkeys; i++)
-			free(namelist[i]);
-		free(namelist);
-	}
-	if (port->pkeys)
-		free(port->pkeys);
+clean_pkeys:
+	free(port->pkeys);
+clean_names:
+	for (i = 0; i < num_pkeys; i++)
+		free(namelist[i]);
+	free(namelist);
 	return -EIO;
 }
 
-- 
2.29.2


  reply	other threads:[~2020-11-16 20:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-16 20:16 [PATCH 0/4] Enable LTO support for rdma-core Jason Gunthorpe
2020-11-16 20:16 ` Jason Gunthorpe [this message]
2020-11-16 20:16 ` [PATCH 2/4] verbs: Simplify the logic assigning vid in ibv_resolve_eth_l2_from_gid() Jason Gunthorpe
2020-11-16 20:16 ` [PATCH 3/4] iwpmd: Always copy the ss_family in copy_iwpm_sockaddr() Jason Gunthorpe
2020-11-16 20:16 ` [PATCH 4/4] util: Use GCC 10's attribute symver to define compat symbol versions Jason Gunthorpe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1-v1-f03f70229014+144-fix_lto_jgg@nvidia.com \
    --to=jgg@nvidia.com \
    --cc=linux-rdma@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.