From: Dmitry Voytik <voytikd@gmail.com>
To: "James E . J . Bottomley" <jejb@linux.ibm.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>
Cc: Ketan Mukadam <ketan.mukadam@broadcom.com>,
Jitendra Bhivare <jitendra.bhivare@broadcom.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
Dmitry Voytik <voytikd@gmail.com>
Subject: [PATCH v2] scsi: be2iscsi: fix potential NULL pointer dereference
Date: Wed, 16 Jan 2019 23:47:35 +0100 [thread overview]
Message-ID: <20190116224735.13061-1-voytikd@gmail.com> (raw)
Fix potential NULL pointer dereference wich might happen in
beiscsi_alloc_mem(). If kmalloc_array() fails and mem_descr->mem_array
is set to NULL, then its dereferencing happens when passing
mem_descr->mem_array[] to dma_free_coherent().
Signed-off-by: Dmitry Voytik <voytikd@gmail.com>
---
Changes since v1:
- prevent double free by setting mem_arr_orig to NULL
drivers/scsi/be2iscsi/be_main.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 74e260027c7d..7b8c80318c38 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -2527,8 +2527,11 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba)
mem_descr->size_in_bytes = phba->mem_req[i];
mem_descr->mem_array = kmalloc_array(j, sizeof(*mem_arr),
GFP_KERNEL);
- if (!mem_descr->mem_array)
+ if (!mem_descr->mem_array) {
+ mem_descr->mem_array = mem_arr_orig;
+ mem_arr_orig = NULL;
goto free_mem;
+ }
memcpy(mem_descr->mem_array, mem_arr_orig,
sizeof(struct mem_array) * j);
--
2.20.1
reply other threads:[~2019-01-16 22:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190116224735.13061-1-voytikd@gmail.com \
--to=voytikd@gmail.com \
--cc=jejb@linux.ibm.com \
--cc=jitendra.bhivare@broadcom.com \
--cc=ketan.mukadam@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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