From patchwork Thu Mar 6 06:09:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jones X-Patchwork-Id: 327313 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B6BB42C02FF for ; Thu, 6 Mar 2014 17:10:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752474AbaCFGJ6 (ORCPT ); Thu, 6 Mar 2014 01:09:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42851 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752442AbaCFGJ4 (ORCPT ); Thu, 6 Mar 2014 01:09:56 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2669jtv006867 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 6 Mar 2014 01:09:46 -0500 Received: from gelk.kernelslacker.org (ovpn-113-111.phx2.redhat.com [10.3.113.111]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2669dRt002087 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 6 Mar 2014 01:09:45 -0500 Received: from gelk.kernelslacker.org (localhost [127.0.0.1]) by gelk.kernelslacker.org (8.14.8/8.14.7) with ESMTP id s2669boA028581; Thu, 6 Mar 2014 01:09:37 -0500 Received: (from davej@localhost) by gelk.kernelslacker.org (8.14.8/8.14.8/Submit) id s2669aqK028580; Thu, 6 Mar 2014 01:09:36 -0500 X-Authentication-Warning: gelk.kernelslacker.org: davej set sender to davej@redhat.com using -f Date: Thu, 6 Mar 2014 01:09:36 -0500 From: Dave Jones To: netdev@vger.kernel.org Cc: arend@broadcom.com, linville@tuxdriver.com, linux-coverity@vger.kernel.org Subject: Re: brcmfmac: fix txglomming scatter-gather packet transfers Message-ID: <20140306060936.GB26578@redhat.com> References: <20140305192636.D06AA660D72@gitolite.kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140305192636.D06AA660D72@gitolite.kernel.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Mar 05, 2014 at 07:26:36PM +0000, Linux Kernel wrote: > Commit: 1eb43018673e735ea9cd756970f4e71ca01a5f21 > Parent: 21f8aaee0c62708654988ce092838aa7df4d25d8 > Author: Arend van Spriel > AuthorDate: Thu Feb 20 18:55:55 2014 +0100 > Committer: John W. Linville > CommitDate: Thu Feb 20 15:53:20 2014 -0500 > > brcmfmac: fix txglomming scatter-gather packet transfers Coverity just flagged this code. > if (skb_tailroom(pkt) < tail_pad && pkt->len > blksize) { > + pkt_pad = brcmu_pkt_buf_get_skb(tail_pad + tail_chop + > + bus->head_align); > if (pkt_pad == NULL) > return -ENOMEM; > ret = brcmf_sdio_txpkt_hdalign(bus, pkt_pad); Right after this, I think we need the diff below or we leak pkt_pad. If this looks right, I'll submit it properly tomorrow. --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 119ee6eaf1c3..ddaa9efd053d 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -1948,8 +1948,10 @@ static int brcmf_sdio_txpkt_prep_sg(struct brcmf_sdio *bus, if (pkt_pad == NULL) return -ENOMEM; ret = brcmf_sdio_txpkt_hdalign(bus, pkt_pad); - if (unlikely(ret < 0)) + if (unlikely(ret < 0)) { + kfree_skb(pkt_pad); return ret; + } memcpy(pkt_pad->data, pkt->data + pkt->len - tail_chop, tail_chop);