linux-kernel - Re: [PATCH] net: wirelesse: wcn36xx: pull allocation outside of critical section

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 9 Dec 2013 07:27:17 +0000
From:	Eugene Krasnikov <k.eugene.e@...il.com>
To:	Michal Nazarewicz <mina86@...a86.com>
Cc:	Peter Stuge <peter@...ge.se>,
	"John W. Linville" <linville@...driver.com>,
	ath9k-devel <ath9k-devel@...ts.ath9k.org>,
	linux-wireless <linux-wireless@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: 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.

On Sat, Dec 7, 2013 at 5:13 PM, Michal Nazarewicz <mina86@...a86.com> wrote:
>
> 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(-)
>
> On Thu, Dec 05 2013, Eugene Krasnikov <k.eugene.e@...il.com> wrote:
>> I think code will look neater if error case will be handled in "else"
>> statement something like: [...]
>
> How about the following:
>
> diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
> index 823631c..ebab2db 100644
> --- a/drivers/net/wireless/ath/wcn36xx/smd.c
> +++ b/drivers/net/wireless/ath/wcn36xx/smd.c
> @@ -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
>



-- 
Best regards,
Eugene
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/