From patchwork Mon Dec 2 13:09:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Nazarewicz?= X-Patchwork-Id: 3265321 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C3FC9BEEAD for ; Mon, 2 Dec 2013 13:09:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9184120174 for ; Mon, 2 Dec 2013 13:09:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E94120163 for ; Mon, 2 Dec 2013 13:09:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752633Ab3LBNJj (ORCPT ); Mon, 2 Dec 2013 08:09:39 -0500 Received: from mail-wg0-f46.google.com ([74.125.82.46]:46588 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751515Ab3LBNJi convert rfc822-to-8bit (ORCPT ); Mon, 2 Dec 2013 08:09:38 -0500 Received: by mail-wg0-f46.google.com with SMTP id m15so11653836wgh.1 for ; Mon, 02 Dec 2013 05:09:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:organization:references :user-agent:face:date:message-id:mime-version:content-type :content-transfer-encoding; bh=e1Rv+gZTCl5KNWdoMVYQdN4xPVGPQKu1+fDY9AMDyoc=; b=SoxtZKG3AF0IlHa/Uw9V0yLMAkc0GkorcJrklP1fttcks1ffHEoy+R5cKd5RM8p6yo jjzP5IHFQ6lVKlY6ObanZKgp/m7uzjQjGuXMQFm3D8avwxiDBpc10nEe2/YmdOIwM8rT vSY8grTYsq+blM2wagx5ZNTAT16FV28Ujke2xiIVUb16RFSC5+2HOBwBcucJNGrpQr7R uCFyHWxQv+clazYpoGVb0LxdpFTjdUPfu3UwLyfH6EFCN6AGnfKoL+g+aRMEwDUdmW/8 5gXM8y91xdl9MEk73ZrtraPbDDlytnvDijgpbC0JBUpbSXjH7yYhqY67bva7/EXuVUkE cZmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:in-reply-to :organization:references:user-agent:face:date:message-id :mime-version:content-type:content-transfer-encoding; bh=e1Rv+gZTCl5KNWdoMVYQdN4xPVGPQKu1+fDY9AMDyoc=; b=TKHWlgZN+VzjlbTf3b18khVHGi1XqKWYpAv/4wpesrmBDb97CJVzQtK6O08YflGbry iJ87mvGtTZgNgJi1P6w1M1dQVUJ83EtTCj4lUDTTMXrpQo1O+Gy7Vbi2+1//zmuBpeqv 6LvJvjf0gSu4FY0jNMvgaauXfrPwp80XR4kbCgJF2ikFrr0xBsN7CGPTNXd7piY1eSFa 3xN18kvmVRUF4f9seftDPn6YEsSZ68+Emtrd+j/A6YYBoJmD4yZQ7pQgfh7DlFM5mv2F 89ePais55y4Um0YzF1zOhCCcEBB43PYlU1EIjSiQwD5dcI+K1cO5lt/axMZZQRWlA8Ze o0Kw== X-Gm-Message-State: ALoCoQnqlBgOQoPw37OjYjsHs0aCwXePUVjuHWKDP2iD4M0n2wU39MmXFs+S+6BBlq+UbQ/zHO8UQcW2cod1LPhVKUGYaQMhUpA0gCwHCjXpIlXipUarmw0C/tBqzsyF9f26wDAu1EkwdH51NwXwDJlVZryGFhaQzNcZzCl8MhkWttHr8y1YPylK120P2jpzADHHUW0e65WerLe2lsoICy4KdfdSTvCcEg== X-Received: by 10.180.210.134 with SMTP id mu6mr18023097wic.37.1385989777108; Mon, 02 Dec 2013 05:09:37 -0800 (PST) Received: from mpn-glaptop.roam.corp.google.com ([2620:0:105f:311:51a5:c540:dbbe:85c]) by mx.google.com with ESMTPSA id nb16sm122125963wic.0.2013.12.02.05.09.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 02 Dec 2013 05:09:35 -0800 (PST) From: Michal Nazarewicz To: Peter Stuge Cc: "John W. Linville" , Eugene Krasnikov , ath9k-devel@lists.ath9k.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCHv2] net: wireless: wcn36xx: fix potential NULL pointer dereference In-Reply-To: <20131201004715.11125.qmail@stuge.se> Organization: http://mina86.com/ References: <1385744870-10164-1-git-send-email-mpn@google.com> <20131201004715.11125.qmail@stuge.se> User-Agent: Notmuch/0.15.2+55~geb6e9d8 (http://notmuchmail.org) Emacs/24.3.50.1 (x86_64-unknown-linux-gnu) X-Face: PbkBB1w#)bOqd`iCe"Ds{e+!C7`pkC9a|f)Qo^BMQvy\q5x3?vDQJeN(DS?|-^$uMti[3D*#^_Ts"pU$jBQLq~Ud6iNwAw_r_o_4]|JO?]}P_}Nc&"p#D(ZgUb4uCNPe7~a[DbPG0T~!&c.y$Ur,=N4RT>]dNpd; KFrfMCylc}gc??'U2j,!8%xdD Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWbfGlUPDDHgE57V0jUupKjgIObY0PLrom9mH4dFRK4gmjPs41MxjOgAAACQElEQVQ4jW3TMWvbQBQHcBk1xE6WyALX1069oZBMlq+ouUwpEQQ6uRjttkWP4CmBgGM0BQLBdPFZYPsyFUo6uEtKDQ7oy/U96XR2Ux8ehH/89Z6enqxBcS7Lg81jmSuujrfCZcLI/TYYvbGj+jbgFpHJ/bqQAUISj8iLyu4LuFHJTosxsucO4jSDNE0Hq3hwK/ceQ5sx97b8LcUDsILfk+ovHkOIsMbBfg43VuQ5Ln9YAGCkUdKJoXR9EclFBhixy3EGVz1K6eEkhxCAkeMMnqoAhAKwhoUJkDrCqvbecaYINlFKSRS1i12VKH1XpUd4qxL876EkMcDvHj3s5RBajHHMlA5iK32e0C7VgG0RlzFPvoYHZLRmAC0BmNcBruhkE0KsMsbEc62ZwUJDxWUdMsMhVqovoT96i/DnX/ASvz/6hbCabELLk/6FF/8PNpPCGqcZTGFcBhhAaZZDbQPaAB3+KrWWy2XgbYDNIinkdWAFcCpraDE/knwe5DBqGmgzESl1p2E4MWAz0VUPgYYzmfWb9yS4vCvgsxJriNTHoIBz5YteBvg+VGISQWUqhMiByPIPpygeDBE6elD973xWwKkEiHZAHKjhuPsFnBuArrzxtakRcISv+XMIPl4aGBUJm8Emk7qBYU8IlgNEIpiJhk/No24jHwkKTFHDWfPniR4iw5vJaw2nzSjfq2zffcE/GDjRC2dn0J0XwPAbDL84TvaFCJEU4Oml9pRyEUhR3Cl2t01AoEjRbs0sYugp14/4X5n4pU4EHHnMAAAAAElFTkSuQmCC X-PGP: 50751FF4 X-PGP-FP: AC1F 5F5C D418 88F8 CC84 5858 2060 4012 5075 1FF4 X-Hashcash: 1:20:131202:linux-wireless@vger.kernel.org::fPOaWaFLuszLroLQ:00000000000000000000000000000000g84 X-Hashcash: 1:20:131202:k.eugene.e@gmail.com::ZYeQteAweS3n4tSx:000000000000000000000000000000000000000002gbi X-Hashcash: 1:20:131202:linux-kernel@vger.kernel.org::YHj6NoqBdWTjQ0jp:0000000000000000000000000000000002YRA X-Hashcash: 1:20:131202:peter@stuge.se::RG3unx/5EAyVhF0B:0004SxM X-Hashcash: 1:20:131202:ath9k-devel@lists.ath9k.org::NJ7Dy7lMEVV1T9j9:00000000000000000000000000000000007NxH X-Hashcash: 1:20:131202:linville@tuxdriver.com::u6QrCTDW3ezLwDHn:000000000000000000000000000000000000000B0mE Date: Mon, 02 Dec 2013 14:09:34 +0100 Message-ID: MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/net/wireless/ath/wcn36xx/smd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) On Sun, Dec 01 2013, Peter Stuge wrote: > Michal Nazarewicz wrote: >> + wcn36xx_err("Run out of memory while hnadling SMD_EVENT (%d)\n", >> + msg_header->msg_type); > > Typo hnadling. Fixed. diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index de9eb2c..3663394 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -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",