From: Xi Wang <xi.wang@gmail.com>
To: Mike Christie <michaelc@cs.wisc.edu>,
"James E.J. Bottomley" <JBottomley@parallels.com>
Cc: open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org,
Xi Wang <xi.wang@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH] iscsi_tcp: bound max_r2t in iscsi_sw_tcp_conn_set_param()
Date: Sat, 31 Dec 2011 17:01:07 -0500 [thread overview]
Message-ID: <1325368867-13696-1-git-send-email-xi.wang@gmail.com> (raw)
A large max_r2t could lead to integer overflow in subsequent call to
iscsi_tcp_r2tpool_alloc(), allocating a smaller buffer than expected
and leading to out-of-bounds write.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Cc: stable@vger.kernel.org
---
drivers/scsi/iscsi_tcp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 7c34d8e..9a1bf21 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -687,7 +687,7 @@ static int iscsi_sw_tcp_conn_set_param(struct iscsi_cls_conn *cls_conn,
struct iscsi_session *session = conn->session;
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data;
- int value;
+ int value = 0;
switch(param) {
case ISCSI_PARAM_HDRDGST_EN:
@@ -700,7 +700,7 @@ static int iscsi_sw_tcp_conn_set_param(struct iscsi_cls_conn *cls_conn,
break;
case ISCSI_PARAM_MAX_R2T:
sscanf(buf, "%d", &value);
- if (value <= 0 || !is_power_of_2(value))
+ if (value <= 0 || value > 65536 || !is_power_of_2(value))
return -EINVAL;
if (session->max_r2t == value)
break;
--
1.7.5.4
next reply other threads:[~2011-12-31 22:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-31 22:01 Xi Wang [this message]
2012-01-02 7:05 ` [PATCH] iscsi_tcp: bound max_r2t in iscsi_sw_tcp_conn_set_param() Mike Christie
2012-01-02 14:18 ` Xi Wang
2012-01-04 6:36 ` Xi Wang
2012-01-04 7:16 ` Mike Christie
2012-01-04 7:12 ` Xi Wang
2012-02-09 16:04 ` Greg KH
2012-02-09 18:04 ` Xi Wang
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=1325368867-13696-1-git-send-email-xi.wang@gmail.com \
--to=xi.wang@gmail.com \
--cc=JBottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
--cc=michaelc@cs.wisc.edu \
--cc=open-iscsi@googlegroups.com \
--cc=stable@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox