net: wireless: wcn36xx: fix potential NULL pointer dereference
PATCH 1/1 net: wireless: wcn36xx: fix potential NULL pointer dereference
From: Michal Nazarewicz <[email protected]>
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.
--- drivers/net/wireless/ath/wcn36xx/smd.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/wcn36xx/smd.c +16 -6
@@ -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",
Signature · 1 line
1.8.4.1
drivers/net/wireless/ath/wcn36xx/smd.c static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len) · line 2059
Quoted 2 lines · Michal Nazarewicz
drivers/net/wireless/ath/wcn36xx/smd.c +2
-0+wcn36xx_err ("Run out of memory while hnadling SMD_EVENT (%d)\n" , + msg_header->msg_type);
Typo hnadling.
//Peter
PATCH v2 1/1 net: wireless: wcn36xx: fix potential NULL pointer dereference
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.
--- drivers/net/wireless/ath/wcn36xx/smd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
Quoted 5 lines · Peter Stuge
Review
Quoted 2 lines · Michal Nazarewicz
(quoted diff) +2
-0+ wcn36xx_err("Run out of memory while hnadling SMD_EVENT (%d)\n", + msg_header->msg_type);Typo hnadling.
Fixed.
drivers/net/wireless/ath/wcn36xx/smd.c +13 -6
@@ -2041,13 +2041,20 @@ 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) +break ; +/* FIXME: Do something smarter then just printing an error. */ +wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , + msg_header->msg_type);break ;default : wcn36xx_err("SMD_EVENT (%d) not supported\n",
Signature · 7 lines
1.8.4.1 -- Best regards, _ _ .o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o ..o | Computer Science, Micha? ?mina86? Nazarewicz (o o) ooo +--<[email protected]>--<xmpp:[email protected]>--ooO--(_)--Ooo--
drivers/net/wireless/ath/wcn36xx/smd.c static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len) · line 2056
Quoted 4 lines
drivers/net/wireless/ath/wcn36xx/smd.c +4
-0+if (msg_ind) +break ; +/* FIXME: Do something smarter then just printing an error. */ + wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n",
I think code will look neater if error case will be handled in "else" statement something like:
if (msg_ind) {
...
} else {
/*print message*/
}
/*unlock and break;*/
How about that?
Quoted 59 lines · Michal Nazarewicz
If kmalloc fails
wcn36xx_smd_rsp_processwill 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 <[email protected]>--- drivers/net/wireless/ath/wcn36xx/smd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)Quoted 5 lines · Peter Stuge
Review
Quoted 2 lines · Michal Nazarewicz
(quoted diff) +2
-0+ wcn36xx_err("Run out of memory while hnadling SMD_EVENT (%d)\n", + msg_header->msg_type);Typo hnadling.
Fixed.
drivers/net/wireless/ath/wcn36xx/smd.c +13
-7@@ -2041,13 +2041,20 @@ 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) +break ; +/* FIXME: Do something smarter then just printing an error. */ +wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , + msg_header->msg_type);break ;default : wcn36xx_err("SMD_EVENT (%d) not supported\n", --1.8.4.1
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Micha? ?mina86? Nazarewicz (o o)
ooo +--<[email protected]>--<xmpp:[email protected]>--ooO--(_)--Ooo--
Signature · 2 lines
Best regards, Eugene
FWIW, I merged the earlier version. Please send any changes as a follow-up patch, probably against wireless-next.
John
Quoted 84 lines · Eugene Krasnikov
drivers/net/wireless/ath/wcn36xx/smd.c static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len) · line 2056
Quoted 4 lines
drivers/net/wireless/ath/wcn36xx/smd.c +4
-0+if (msg_ind) +break ; +/* FIXME: Do something smarter then just printing an error. */ + wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n",I think code will look neater if error case will be handled in "else" statement something like:
if (msg_ind) {
...
} else {
/*print message*/
}
/*unlock and break;*/How about that?
Quoted 59 lines · Michal Nazarewicz
If kmalloc fails
wcn36xx_smd_rsp_processwill 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 <[email protected]>--- drivers/net/wireless/ath/wcn36xx/smd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)Quoted 5 lines · Peter Stuge
Review
Quoted 2 lines · Michal Nazarewicz
(quoted diff) +2
-0+ wcn36xx_err("Run out of memory while hnadling SMD_EVENT (%d)\n", + msg_header->msg_type);Typo hnadling.
Fixed.
drivers/net/wireless/ath/wcn36xx/smd.c +13
-7@@ -2041,13 +2041,20 @@ 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) +break ; +/* FIXME: Do something smarter then just printing an error. */ +wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , + msg_header->msg_type);break ;default : wcn36xx_err("SMD_EVENT (%d) not supported\n", --1.8.4.1
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Micha? ?mina86? Nazarewicz (o o)
ooo +--<[email protected]>--<xmpp:[email protected]>--ooO--(_)--Ooo--Signature · 2 lines
Best regards, Eugene
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you linville at tuxdriver.com might be all we have. Be ready.
PATCH 1/1 net: wirelesse: wcn36xx: pull allocation outside of critical section
In reply to Eugene KrasnikovThis also simplifies flow-controll as there is now only one if condition with a single branch.
--- drivers/net/wireless/ath/wcn36xx/smd.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
Quoted 2 lines · Eugene Krasnikov
I think code will look neater if error case will be handled in "else" statement something like: [...]
How about the following:
drivers/net/wireless/ath/wcn36xx/smd.c +15 -13
@@ -2056,22 +2056,24 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len)case WCN36XX_HAL_OTA_TX_COMPL_IND :case WCN36XX_HAL_MISSED_BEACON_IND :case WCN36XX_HAL_DELETE_STA_CONTEXT_IND : -mutex_lock (&wcn->hal_ind_mutex); msg_ind =kmalloc (sizeof (*msg_ind),GFP_KERNEL ); -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" ); +if (!msg_ind) { +/* +* FIXME: Do something smarter then just +* printing an error. +*/ +wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , + msg_header->msg_type); +break ; } +mutex_lock (&wcn->hal_ind_mutex); + 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) -break ; -/* FIXME: Do something smarter then just printing an error. */ -wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , - msg_header->msg_type);break ;default : wcn36xx_err("SMD_EVENT (%d) not supported\n",
Signature · 1 line
1.8.4
Re: [PATCH] net: wirelesse: wcn36xx: pull allocation outside of critical section
hal_ind_mutex suppose to protect msg_ind but with this patch allocation will be done outside the critical section.
Quoted 58 lines · Michal Nazarewicz
This also simplifies flow-controll as there is now only one if condition with a single branch.
--- drivers/net/wireless/ath/wcn36xx/smd.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)Quoted 2 lines · Eugene Krasnikov
I think code will look neater if error case will be handled in "else" statement something like: [...]
How about the following:
drivers/net/wireless/ath/wcn36xx/smd.c +15
-14@@ -2056,22 +2056,24 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len)case WCN36XX_HAL_OTA_TX_COMPL_IND :case WCN36XX_HAL_MISSED_BEACON_IND :case WCN36XX_HAL_DELETE_STA_CONTEXT_IND : -mutex_lock (&wcn->hal_ind_mutex); msg_ind =kmalloc (sizeof (*msg_ind),GFP_KERNEL ); -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" ); +if (!msg_ind) { +/* +* FIXME: Do something smarter then just +* printing an error. +*/ +wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , + msg_header->msg_type); +break ; } +mutex_lock (&wcn->hal_ind_mutex); + 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) -break ; -/* FIXME: Do something smarter then just printing an error. */ -wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , - msg_header->msg_type);break ;default : wcn36xx_err("SMD_EVENT (%d) not supported\n", --1.8.4
Signature · 2 lines
Best regards, Eugene
PATCH 1/1 net: wirelesse: wcn36xx: check allocation and trim critical section
Commit [3469adb3: fix potential NULL pointer dereference] introduced a check of msg_ind allocation, but omitted allocation of msg_ind->msg. Moreover, it introduced two if statements, which looked a bit clunky.
This commit moves allocation code outside of the critical section so there's no need to dance around mutex_unlock, and adds the missing allocation check.
--- drivers/net/wireless/ath/wcn36xx/smd.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-)
Quoted 2 lines · Eugene Krasnikov
hal_ind_mutexsuppose to protectmsg_indbut with this patch allocation will be done outside the critical section.
msg_ind is a local variable which is not shared outside of the function until it's added to a list. I don't see how it matters if it's allocation and initialisation is done under mutex.
In fact, there's another kmalloc call that should be checked and can be done outside of the critical section, so disregard my previous patch, here's a new one.
drivers/net/wireless/ath/wcn36xx/smd.c +19 -13
@@ -2056,22 +2056,28 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len)case WCN36XX_HAL_OTA_TX_COMPL_IND :case WCN36XX_HAL_MISSED_BEACON_IND :case WCN36XX_HAL_DELETE_STA_CONTEXT_IND : -mutex_lock (&wcn->hal_ind_mutex); msg_ind =kmalloc (sizeof (*msg_ind),GFP_KERNEL ); -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" ); +if (!msg_ind) + goto nomem; + msg_ind->msg_len = len; + msg_ind->msg =kmalloc (len,GFP_KERNEL ); +if (!msg_ind->msg) { +kfree (msg_ind); +nomem: +/* +* FIXME: Do something smarter then just +* printing an error. +*/ +wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , + msg_header->msg_type); +break ; } +memcpy (msg_ind->msg, buf, len); +mutex_lock (&wcn->hal_ind_mutex); +list_add_tail (&msg_ind->list, &wcn->hal_ind_queue); +queue_work (wcn->hal_ind_wq, &wcn->hal_ind_work);mutex_unlock (&wcn->hal_ind_mutex); -if (msg_ind) -break ; -/* FIXME: Do something smarter then just printing an error. */ -wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , - msg_header->msg_type); +wcn36xx_dbg (WCN36XX_DBG_HAL ,"indication arrived\n" );break ;default : wcn36xx_err("SMD_EVENT (%d) not supported\n",
Signature · 9 lines
1.8.4 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 835 bytes Desc: not available Url : http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20131209/eade3c6a/attachment.pgp
Re: [PATCH] net: wirelesse: wcn36xx: check allocation and trim critical section
Missing Signed-off-by...
Quoted 73 lines · Michal Nazarewicz
Commit [
3469adb3: fix potential NULL pointer dereference] introduced a check ofmsg_indallocation, but omitted allocation ofmsg_ind->msg. Moreover, it introduced two if statements, which looked a bit clunky.This commit moves allocation code outside of the critical section so there's no need to dance around
mutex_unlock, and adds the missing allocation check.--- drivers/net/wireless/ath/wcn36xx/smd.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-)Quoted 2 lines · Eugene Krasnikov
hal_ind_mutexsuppose to protectmsg_indbut with this patch allocation will be done outside the critical section.
msg_indis a local variable which is not shared outside of the function until it's added to a list. I don't see how it matters if it's allocation and initialisation is done under mutex.In fact, there's another kmalloc call that should be checked and can be done outside of the critical section, so disregard my previous patch, here's a new one.
drivers/net/wireless/ath/wcn36xx/smd.c +19
-13@@ -2056,22 +2056,28 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len)case WCN36XX_HAL_OTA_TX_COMPL_IND :case WCN36XX_HAL_MISSED_BEACON_IND :case WCN36XX_HAL_DELETE_STA_CONTEXT_IND : -mutex_lock (&wcn->hal_ind_mutex); msg_ind =kmalloc (sizeof (*msg_ind),GFP_KERNEL ); -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" ); +if (!msg_ind) + goto nomem; + msg_ind->msg_len = len; + msg_ind->msg =kmalloc (len,GFP_KERNEL ); +if (!msg_ind->msg) { +kfree (msg_ind); +nomem: +/* +* FIXME: Do something smarter then just +* printing an error. +*/ +wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , + msg_header->msg_type); +break ; } +memcpy (msg_ind->msg, buf, len); +mutex_lock (&wcn->hal_ind_mutex); +list_add_tail (&msg_ind->list, &wcn->hal_ind_queue); +queue_work (wcn->hal_ind_wq, &wcn->hal_ind_work);mutex_unlock (&wcn->hal_ind_mutex); -if (msg_ind) -break ; -/* FIXME: Do something smarter then just printing an error. */ -wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , - msg_header->msg_type); +wcn36xx_dbg (WCN36XX_DBG_HAL ,"indication arrived\n" );break ;default : wcn36xx_err("SMD_EVENT (%d) not supported\n",Signature · 1 line
1.8.4
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you linville at tuxdriver.com might be all we have. Be ready.
PATCH RESEND 1/1 net: wirelesse: wcn36xx: pull allocation outside of critical section
Commit [3469adb3: fix potential NULL pointer dereference] introduced a check of msg_ind allocation, but omitted allocation of msg_ind->msg. Moreover, it introduced two if statements, which looked a bit clunky.
This commit moves allocation code outside of the critical section so there's no need to dance around mutex_unlock, and adds the missing allocation check.
--- drivers/net/wireless/ath/wcn36xx/smd.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-)
Quoted 1 line · John W. Linville
Missing Signed-off-by...
Sorry about that.
drivers/net/wireless/ath/wcn36xx/smd.c +19 -13
@@ -2060,22 +2060,28 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len)case WCN36XX_HAL_OTA_TX_COMPL_IND :case WCN36XX_HAL_MISSED_BEACON_IND :case WCN36XX_HAL_DELETE_STA_CONTEXT_IND : -mutex_lock (&wcn->hal_ind_mutex); msg_ind =kmalloc (sizeof (*msg_ind),GFP_KERNEL ); -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" ); +if (!msg_ind) + goto nomem; + msg_ind->msg_len = len; + msg_ind->msg =kmalloc (len,GFP_KERNEL ); +if (!msg_ind->msg) { +kfree (msg_ind); +nomem: +/* +* FIXME: Do something smarter then just +* printing an error. +*/ +wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , + msg_header->msg_type); +break ; } +memcpy (msg_ind->msg, buf, len); +mutex_lock (&wcn->hal_ind_mutex); +list_add_tail (&msg_ind->list, &wcn->hal_ind_queue); +queue_work (wcn->hal_ind_wq, &wcn->hal_ind_work);mutex_unlock (&wcn->hal_ind_mutex); -if (msg_ind) -break ; -/* FIXME: Do something smarter then just printing an error. */ -wcn36xx_err ("Run out of memory while handling SMD_EVENT (%d)\n" , - msg_header->msg_type); +wcn36xx_dbg (WCN36XX_DBG_HAL ,"indication arrived\n" );break ;default : wcn36xx_err("SMD_EVENT (%d) not supported\n",
Signature · 1 line
1.8.4