From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 431ACC4360C for ; Sat, 28 Sep 2019 22:47:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A2672054F for ; Sat, 28 Sep 2019 22:47:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J3JyPmKc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728814AbfI1Wn6 (ORCPT ); Sat, 28 Sep 2019 18:43:58 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:54884 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728768AbfI1Wn6 (ORCPT ); Sat, 28 Sep 2019 18:43:58 -0400 Received: by mail-wm1-f65.google.com with SMTP id p7so9462783wmp.4 for ; Sat, 28 Sep 2019 15:43:56 -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=Ol2wW5+nyNWwpsEhk6jx2VVV1ORwpC9AcTq888DvDDs=; b=J3JyPmKct/aMooDk0E5WtMAUDbYnUgMWyfGRjT5Irp/ZY1nvbH51bcFNfPz/9SiUdT j/KXpQ474COmw3vgh9rgsKuwwyIXisommXTUORlMw4DiAgWlIevGraV5BSrwBLhCQShi TBfdasTxK173xhaYWaNXlZw5pQdvYI75CRBP9RdzcjuPdAxPaq6i5KmP4VH01DlakZqx 3uXbgyMNXYkHRLxYNvwVFh+7Olo7uH0qXkejgcuoi8JUdOKbaX59YKCQzfQnzfGGd/5v +uLsdus0PXq40AxDUgJoAmo3evq0YKVikiN9YQymprKQJyCEuF/MOyDpaTOk71swvUkO pqWA== 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=Ol2wW5+nyNWwpsEhk6jx2VVV1ORwpC9AcTq888DvDDs=; b=oIBowDHWaq21S+d9OXw+9hOEluEpWsXHShOym2VgrHLCUMtIBBYnl34HWvvrNAOQDu zLwjMu4abKfDJFsIGNJDLEYwvUPPOV4YtD8SOVv/8f+OH50avg+pxXLUMFO+aVaYvJGR BOdBTGfCxoPsZr49Vb94p+nZETeZbR4LvmQ20X4gvMscMt/zONADPzMfJq5AWaEcraKj sJ7ffInLissP7V7eFGkR70SHD3z2HGdTvAjLvQXt5sCjiZnpmWqp2qVZQ/B8wurgBcdK 5hkFxJZie/hWKhHegAITectgRwu/Klzqz48QdVD2WJUyi7cZNu9Qm+DQGodiyEvbRw+g WgYQ== X-Gm-Message-State: APjAAAX0TDgSDQ9kkIi65KdcHwLdL9yhXg/xC9MFbWqYZfuGjzrWeNef QhSvU+CrDb/gc8w0lhO8W4g= X-Google-Smtp-Source: APXvYqzda2MLF60FFG8v+8ryPc12+7kWU9aAiuuMf2oW1N6TUPUngz6Y616RqnFODFLrkfhHagLKHA== X-Received: by 2002:a05:600c:219a:: with SMTP id e26mr12589151wme.86.1569710636193; Sat, 28 Sep 2019 15:43:56 -0700 (PDT) Received: from localhost.localdomain ([86.124.196.40]) by smtp.gmail.com with ESMTPSA id t13sm12841470wra.70.2019.09.28.15.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Sep 2019 15:43:55 -0700 (PDT) From: Vladimir Oltean To: andrew@lunn.ch, f.fainelli@gmail.com, vivien.didelot@gmail.com, davem@davemloft.net Cc: netdev@vger.kernel.org, Navid Emamdoost , Vladimir Oltean Subject: [PATCH net] net: dsa: sja1105: Prevent leaking memory Date: Sun, 29 Sep 2019 01:43:39 +0300 Message-Id: <20190928224339.31784-1-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Navid Emamdoost In sja1105_static_config_upload, in two cases memory is leaked: when static_config_buf_prepare_for_upload fails and when sja1105_inhibit_tx fails. In both cases config_buf should be released. Fixes: 8aa9ebccae87 ("net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch") Fixes: 1a4c69406cc1 ("net: dsa: sja1105: Prevent PHY jabbering during switch reset") Signed-off-by: Navid Emamdoost Signed-off-by: Vladimir Oltean --- Changes since v3: I took over the patch and fixed formatting. drivers/net/dsa/sja1105/sja1105_spi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c index 84dc603138cf..58dd37ecde17 100644 --- a/drivers/net/dsa/sja1105/sja1105_spi.c +++ b/drivers/net/dsa/sja1105/sja1105_spi.c @@ -409,7 +409,8 @@ int sja1105_static_config_upload(struct sja1105_private *priv) rc = static_config_buf_prepare_for_upload(priv, config_buf, buf_len); if (rc < 0) { dev_err(dev, "Invalid config, cannot upload\n"); - return -EINVAL; + rc = -EINVAL; + goto out; } /* Prevent PHY jabbering during switch reset by inhibiting * Tx on all ports and waiting for current packet to drain. @@ -418,7 +419,8 @@ int sja1105_static_config_upload(struct sja1105_private *priv) rc = sja1105_inhibit_tx(priv, port_bitmap, true); if (rc < 0) { dev_err(dev, "Failed to inhibit Tx on ports\n"); - return -ENXIO; + rc = -ENXIO; + goto out; } /* Wait for an eventual egress packet to finish transmission * (reach IFG). It is guaranteed that a second one will not -- 2.17.1