From patchwork Mon Jul 18 23:24:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 9235677 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 769D66075D for ; Mon, 18 Jul 2016 23:25:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68692212CF for ; Mon, 18 Jul 2016 23:25:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D48526AE3; Mon, 18 Jul 2016 23:25:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08DE4265F9 for ; Mon, 18 Jul 2016 23:25:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247AbcGRXY5 (ORCPT ); Mon, 18 Jul 2016 19:24:57 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:35012 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751825AbcGRXYx (ORCPT ); Mon, 18 Jul 2016 19:24:53 -0400 Received: by mail-pa0-f65.google.com with SMTP id cf3so110443pad.2 for ; Mon, 18 Jul 2016 16:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hJrXqlB6WK2d+9c/qMdt6WA5etJ0UlQcLVtQYgNm4Cc=; b=GxrSa+v0nd7hLLNXXIzYC/WDkGg0EdWTU0Wl7dDV/dhAPhrX3pT+kVou2PzdyE+4Bv /zTfATFzIx2Z+HwrL5wi2bM0j1BhCuWgC/pqf8Z5Gih9t0SKOAxdgXGvBeHc0IweiyqY sWtsxVvnIKG39e7ANg8lRldNd7ueXc9H1mkr/0MqyoJIAVHWf33q+l2c+La/fY6yF5H7 9C87QtQaxX2wb3gKy6vIoQv0HPhm3Lb4iWy/CN6n+8+3YEHLl+ct8yoLppsQN5ntD869 /yDWMMhrpoDaVq+94ih71vh6u4ExZzPUCO0FjhDIpbTmrXLhRBY5OqSpowy04yiZP+bS PlTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hJrXqlB6WK2d+9c/qMdt6WA5etJ0UlQcLVtQYgNm4Cc=; b=LHWKOHYyD/x/taqTaLfNzgeKtDfLomt1rnGO/IL9w3hEpxKnDnC6b08mlpowNuLA3C 7WhoKq8tGssJs9nZwkRzNK1sAWfr0CatvBN69R97eexhFUJnO36vVEfYhHZenkXhuRKS a/2+t1lDXbwSVfF4JHBfIpMiFzhNjX0yIkA0pRkYrwxXBRc6iWNmHtdwJby6hq53Ig38 gHadhcgmg8Kl8m3ondJWO6+MlF0of8+Q4unE6Z20AKxucohslR9mjIfxnqy+vwGLOQaC y+o+VCLe09DiVIkfs6ARwu+lKgNABPqHAXYNO4NGSSeA6dnOd6rtyB80TE+nOtrBd2dH JLuw== X-Gm-Message-State: ALyK8tL/y2x7Rn6BRyo808mW7ZYWV3t219bpfE9xHKXGrUxmXiP1FYTB6iR559nKjjnvUA== X-Received: by 10.66.181.139 with SMTP id dw11mr60833946pac.2.1468884292829; Mon, 18 Jul 2016 16:24:52 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id dz13sm6934659pac.44.2016.07.18.16.24.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jul 2016 16:24:52 -0700 (PDT) From: Florian Fainelli To: brcm80211-dev-list.pdl@broadcom.com Cc: linux-wireless@vger.kernel.org, pieterpg@broadcom.com, kvalo@codeaurora.org, arend.vanspriel@broadcom.com, hante.meuleman@broadcom.com, Florian Fainelli Subject: [PATCH 2/4] brcmsmac: Free packet if dma_mapping_error() fails in dma_rxfill Date: Mon, 18 Jul 2016 16:24:35 -0700 Message-Id: <1468884277-18606-3-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468884277-18606-1-git-send-email-f.fainelli@gmail.com> References: <1468884277-18606-1-git-send-email-f.fainelli@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In case dma_mapping_error() returns an error in dma_rxfill, we would be leaking a packet that we allocated with brcmu_pkt_buf_get_skb(). Reported-by: coverity (CID 1081819) Fixes: 67d0cf50bd32 ("brcmsmac: Fix WARNING caused by lack of calls to dma_mapping_error()") Signed-off-by: Florian Fainelli Acked-by: Arend van Spriel --- drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c index 796f5f9d5d5a..b7df576bb84d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c @@ -1079,8 +1079,10 @@ bool dma_rxfill(struct dma_pub *pub) pa = dma_map_single(di->dmadev, p->data, di->rxbufsize, DMA_FROM_DEVICE); - if (dma_mapping_error(di->dmadev, pa)) + if (dma_mapping_error(di->dmadev, pa)) { + brcmu_pkt_buf_free_skb(p); return false; + } /* save the free packet pointer */ di->rxp[rxout] = p;