From: Michal Nazarewicz <mpn@google.com>
To: "John W. Linville" <linville@tuxdriver.com>,
Eugene Krasnikov <k.eugene.e@gmail.com>
Cc: linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] net: wireless: wcn36xx: fix potential NULL pointer dereference
Date: Fri, 29 Nov 2013 18:07:50 +0100 [thread overview]
Message-ID: <1385744870-10164-1-git-send-email-mpn@google.com> (raw)
From: Michal Nazarewicz <mina86@mina86.com>
If kmalloc fails wcn36xx_smd_rsp_process will attempt to dereference
a NULL pointer. There might be a better error recovery then just
printing an error, but printing an error message is better then the
current behaviour.
Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
---
drivers/net/wireless/ath/wcn36xx/smd.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index de9eb2c..10d6ae9 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -2041,13 +2041,23 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len)
case WCN36XX_HAL_DELETE_STA_CONTEXT_IND:
mutex_lock(&wcn->hal_ind_mutex);
msg_ind = kmalloc(sizeof(*msg_ind), GFP_KERNEL);
- msg_ind->msg_len = len;
- msg_ind->msg = kmalloc(len, GFP_KERNEL);
- memcpy(msg_ind->msg, buf, len);
- list_add_tail(&msg_ind->list, &wcn->hal_ind_queue);
- queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work);
- wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n");
+ if (msg_ind) {
+ msg_ind->msg_len = len;
+ msg_ind->msg = kmalloc(len, GFP_KERNEL);
+ memcpy(msg_ind->msg, buf, len);
+ list_add_tail(&msg_ind->list, &wcn->hal_ind_queue);
+ queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work);
+ wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n");
+ }
mutex_unlock(&wcn->hal_ind_mutex);
+ if (!msg_ind) {
+ /*
+ * FIXME: Do something smarter then just
+ * printing an error when allocation fails.
+ */
+ wcn36xx_err("Run out of memory while hnadling SMD_EVENT (%d)\n",
+ msg_header->msg_type);
+ }
break;
default:
wcn36xx_err("SMD_EVENT (%d) not supported\n",
--
1.8.4.1
next reply other threads:[~2013-11-29 17:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-29 17:07 Michal Nazarewicz [this message]
2013-12-01 0:47 ` [ath9k-devel] [PATCH] net: wireless: wcn36xx: fix potential NULL pointer dereference Peter Stuge
2013-12-02 13:09 ` [PATCHv2] " Michal Nazarewicz
2013-12-05 8:41 ` Eugene Krasnikov
2013-12-06 16:12 ` John W. Linville
2013-12-07 17:13 ` [PATCH] net: wirelesse: wcn36xx: pull allocation outside of critical section Michal Nazarewicz
2013-12-09 7:27 ` Eugene Krasnikov
2013-12-09 11:34 ` [PATCH] net: wirelesse: wcn36xx: check allocation and trim " Michal Nazarewicz
2013-12-11 15:52 ` John W. Linville
2013-12-11 16:43 ` [PATCH RESEND] net: wirelesse: wcn36xx: pull allocation outside of " Michal Nazarewicz
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=1385744870-10164-1-git-send-email-mpn@google.com \
--to=mpn@google.com \
--cc=ath9k-devel@lists.ath9k.org \
--cc=k.eugene.e@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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).