From: Jia-Ju Bai <baijiaju1990@gmail.com>
To: lduncan@suse.com, cleech@redhat.com, jejb@linux.ibm.com,
martin.petersen@oracle.com
Cc: open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org, Jia-Ju Bai <baijiaju1990@gmail.com>
Subject: [PATCH] scsi: libiscsi: Fix possible null-pointer dereferences in iscsi_conn_get_addr_param()
Date: Mon, 29 Jul 2019 17:13:39 +0800 [thread overview]
Message-ID: <20190729091339.30815-1-baijiaju1990@gmail.com> (raw)
In iscsi_conn_get_addr_param(), sin6 may be NULL when reaching lines
3479 and 3487:
len = sprintf(buf, "%pI6\n", &sin6->sin6_addr);
len = sprintf(buf, "%hu\n", be16_to_cpu(sin6->sin6_port));
Thus, possible null-pointer dereferences may occur.
To fix these bugs, sin6 is checked before being used, and len is
initialized to -EINVAL.
These bugs are found by a static analysis tool STCheck written by us.
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
---
drivers/scsi/libiscsi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index ebd47c0cf9e9..58f072d5c43f 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -3457,7 +3457,7 @@ int iscsi_conn_get_addr_param(struct sockaddr_storage *addr,
{
struct sockaddr_in6 *sin6 = NULL;
struct sockaddr_in *sin = NULL;
- int len;
+ int len = -EINVAL;
switch (addr->ss_family) {
case AF_INET:
@@ -3475,14 +3475,14 @@ int iscsi_conn_get_addr_param(struct sockaddr_storage *addr,
case ISCSI_HOST_PARAM_IPADDRESS:
if (sin)
len = sprintf(buf, "%pI4\n", &sin->sin_addr.s_addr);
- else
+ else if (sin6)
len = sprintf(buf, "%pI6\n", &sin6->sin6_addr);
break;
case ISCSI_PARAM_CONN_PORT:
case ISCSI_PARAM_LOCAL_PORT:
if (sin)
len = sprintf(buf, "%hu\n", be16_to_cpu(sin->sin_port));
- else
+ else if (sin6)
len = sprintf(buf, "%hu\n",
be16_to_cpu(sin6->sin6_port));
break;
--
2.17.0
next reply other threads:[~2019-07-29 9:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 9:13 Jia-Ju Bai [this message]
2019-08-27 5:33 ` libiscsi: Fix possible null-pointer dereferences in iscsi_conn_get_addr_param() Markus Elfring
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=20190729091339.30815-1-baijiaju1990@gmail.com \
--to=baijiaju1990@gmail.com \
--cc=cleech@redhat.com \
--cc=jejb@linux.ibm.com \
--cc=lduncan@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=open-iscsi@googlegroups.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).