From patchwork Thu Aug 24 23:01:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 805693 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fqJqS1Hu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xdftC4vtKz9s06 for ; Fri, 25 Aug 2017 09:01:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753827AbdHXXBV (ORCPT ); Thu, 24 Aug 2017 19:01:21 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:36070 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411AbdHXXBU (ORCPT ); Thu, 24 Aug 2017 19:01:20 -0400 Received: by mail-wr0-f193.google.com with SMTP id p8so500788wrf.3 for ; Thu, 24 Aug 2017 16:01:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=IByrIa8CDSUnV3PwmROcy/fMpi++FpCRXqkbGuUTObQ=; b=fqJqS1HuJxw1EgTg8l2QFqJPlmsv1GISFkQwabKzmrJqCLQqLB6nVXIBbNPUkn7bbB 4ccI9iM/NXVqgtXPPtPO0MfQutif2NQKM/kSR0qHuZPP27P9V+zIN2DkjBiRyMJEu5HM tpYpVSyQ8kOQNFu+5/9EHhBNlW4JIN40fv4qFEHUnOGgyQjKc6CpbKLt24oCaX6Qjy5s zM7jpskTQY/ma1eUWVBBcCF6BH8cCIIUbVKgMRLZL7XoyJ51fGWbfpQcWcmAZIFDn9kG jZSBioiZcZcnIom3Ov2N3XI2jDTD2jthdwA7OPSWeB0FeFBZSQfmCoxSMVicRZGtvucc Vwgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IByrIa8CDSUnV3PwmROcy/fMpi++FpCRXqkbGuUTObQ=; b=cOw2lVPiGbUYGT6/MVJaXRtU/VY6qlHXeHb2baCTpFygrjjKiBkxO4RB8sYcUPk1OH cdSBHBvGWQa+FupeVoH4wu8sBpYTTPZ0DYIzKkQOPK5V9fEX1KfTEiAC5J+i5VFRaQUz SOZfy6kTlZcqo2Jb6RqmWTSDJ1gz4rtNWtc54SbudKaPrfG51VttwNWXNmqlSY/2PcNT C0FzESBy/c7FBOyHshFJVqbQoXcyS1e0RIi6gRYcQ8qZvn1RGTBMmL+QSqWBnmmfAdJc ygjm7glYsJNNA8nJsL2QkMb+KWEG6+i+XJUBXm/wIykNYXjE9aELSzr06y4A14D9m3F7 cySQ== X-Gm-Message-State: AHYfb5j+4lou8muFgNPDMxj8XRUXqdhvc2XrMYEkTfqM0FbRbcjt+D+3 yGSjeA5Cj/+HFLDkAJM= X-Received: by 10.223.136.198 with SMTP id g6mr5282147wrg.280.1503615679321; Thu, 24 Aug 2017 16:01:19 -0700 (PDT) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id u101sm10822346wrc.40.2017.08.24.16.01.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Aug 2017 16:01:18 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@gmail.com, Florian Fainelli Subject: [PATCH net] net: systemport: Free DMA coherent descriptors on errors Date: Thu, 24 Aug 2017 16:01:13 -0700 Message-Id: <20170824230113.15283-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case bcm_sysport_init_tx_ring() is not able to allocate ring->cbs, we would return with an error, and call bcm_sysport_fini_tx_ring() and it would see that ring->cbs is NULL and do nothing. This would leak the coherent DMA descriptor area, so we need to free it on error before returning. Reported-by: Eric Dumazet Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver") Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index e6add99cc31c..c28fa5a8734c 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -1346,6 +1346,8 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv, ring->cbs = kcalloc(size, sizeof(struct bcm_sysport_cb), GFP_KERNEL); if (!ring->cbs) { + dma_free_coherent(kdev, sizeof(struct dma_desc), + ring->desc_cpu, ring->desc_dma); netif_err(priv, hw, priv->netdev, "CB allocation failed\n"); return -ENOMEM; }