From patchwork Wed Jan 16 10:23:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 1025746 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fjws5pdKz9sCX for ; Wed, 16 Jan 2019 21:23:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391950AbfAPKXq (ORCPT ); Wed, 16 Jan 2019 05:23:46 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:34580 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389312AbfAPKXp (ORCPT ); Wed, 16 Jan 2019 05:23:45 -0500 Received: by mail-lf1-f65.google.com with SMTP id p6so4475181lfc.1; Wed, 16 Jan 2019 02:23:43 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=pJ5y+r34Be8kigWKj+hhR8ahXyO53U2Pxhu9H83xqfw=; b=VZZ02mxiD2T53Whtw4YvEvvajA7BpUHlcKUkLxnHwASyf6OBkSGa1g2q6dHI8T80Sg KjyJ/EJ/RNaGshIm2UzW4T9y30/mo+TLPa1ODkyjnpmA4uanqReP2/WXTPhQ4j7veib7 kZgKESg940fcXvkc2OhEd/qCDf59WH43ERel2cjYyIRiTD1cxhO2RT5Q8VznaXH/tK/G SFt9Vwk4PQOAZ8d7L804wzDihhDbnDRqF5aLqkUxqMfdpQaD7UJHyq/drTn7Rpl4nF0j cQWE82TIj+OCtrbInJ1PyLP1ESX2jUpuglfA+tu67yEfxaeztxU+dY35o+HlrmlgOgKG nIsQ== X-Gm-Message-State: AJcUukc+n2NNd9zXkGmG9KomZqa3GsmxkarjtKYhNhJ9ZYP/sJnftAPN nEvNTw6ftV/qch/TVGsA1JW8q/Nv X-Google-Smtp-Source: ALg8bN6RWKHIYSUb21CL3IIt/572Xgsbnhzktgvl2pLQ6vLAL51ENr60rRsDpaDxEcworEF4m1VaLw== X-Received: by 2002:a19:4f0c:: with SMTP id d12mr6095440lfb.121.1547634222245; Wed, 16 Jan 2019 02:23:42 -0800 (PST) Received: from xi.terra (c-74bee655.07-184-6d6c6d4.bbcust.telenor.se. [85.230.190.116]) by smtp.gmail.com with ESMTPSA id y14-v6sm956481ljj.55.2019.01.16.02.23.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 02:23:40 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.91) (envelope-from ) id 1gjiMH-0007vh-Nh; Wed, 16 Jan 2019 11:23:41 +0100 From: Johan Hovold To: Hauke Mehrtens Cc: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable Subject: [PATCH 1/3] net: dsa: lantiq_gswip: fix use-after-free on failed probe Date: Wed, 16 Jan 2019 11:23:33 +0100 Message-Id: <20190116102335.30433-2-johan@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190116102335.30433-1-johan@kernel.org> References: <20190116102335.30433-1-johan@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure to disable and deregister the switch on late probe errors to avoid use-after-free when the device-resource-managed switch is freed. Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") Cc: stable # 4.20 Cc: Hauke Mehrtens Signed-off-by: Johan Hovold Reviewed-by: Andrew Lunn Acked-by: Hauke Mehrtens --- drivers/net/dsa/lantiq_gswip.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c index 693a67f45bef..b06c41c98de9 100644 --- a/drivers/net/dsa/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq_gswip.c @@ -1099,7 +1099,7 @@ static int gswip_probe(struct platform_device *pdev) dev_err(dev, "wrong CPU port defined, HW only supports port: %i", priv->hw_info->cpu_port); err = -EINVAL; - goto mdio_bus; + goto disable_switch; } platform_set_drvdata(pdev, priv); @@ -1109,6 +1109,9 @@ static int gswip_probe(struct platform_device *pdev) (version & GSWIP_VERSION_MOD_MASK) >> GSWIP_VERSION_MOD_SHIFT); return 0; +disable_switch: + gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB); + dsa_unregister_switch(priv->ds); mdio_bus: if (mdio_np) mdiobus_unregister(priv->ds->slave_mii_bus); From patchwork Wed Jan 16 10:23:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 1025749 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fjx81dxbz9sCX for ; Wed, 16 Jan 2019 21:24:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391931AbfAPKXp (ORCPT ); Wed, 16 Jan 2019 05:23:45 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:43008 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731497AbfAPKXp (ORCPT ); Wed, 16 Jan 2019 05:23:45 -0500 Received: by mail-lf1-f68.google.com with SMTP id u18so4418659lff.10; Wed, 16 Jan 2019 02:23:43 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=YA0AiDvRAudQt5u8BUa4L1frP6objJYUQxko5FZsQNk=; b=Ofm0Zpt9JzcE1kFYmk/U+23+jWWgJXHVyDtAG6YrFg9HdlkB5WDlbG2GU2n3XMyd68 6WFRwKPLVEMM+Z4ZoePmN5q/58JXSmejXgJVaBS4KPLSIys1eM/6Mc56jiJHHFjvMtZU 5x87NIYjpMRtRzks0JP150sbtMinfdQYy8fvSP+Mck+Gk5zehRwzSvGn7ggNbidFSY9u //Pi8aVjgpbaqHg9k5nfhxoLxgRSXugra1fpqO94C4xCgjVFFPuV75fYkl8ut+1bZBDo jJTlYsomA1P4UJC8nD+gTFtpSIjvThnTRnmQqw7r3bah0qnMR5gy5BB8UQhdaEJEOtVt TeQg== X-Gm-Message-State: AJcUukcinszM9HAV6dvzBFfQINlP54Jmk979Ouuz6ANWoEIyWuI/wYbz AasLT1/qA5cGRoD3CW21V8s= X-Google-Smtp-Source: ALg8bN5VLaBeBuO7OV1dHbDsz+NccoSu00zgfSeCe8lYr6NoPR/7AStCKyoKWcAyvqC3igBcq1K36g== X-Received: by 2002:ac2:50c4:: with SMTP id h4mr6231146lfm.81.1547634221660; Wed, 16 Jan 2019 02:23:41 -0800 (PST) Received: from xi.terra (c-74bee655.07-184-6d6c6d4.bbcust.telenor.se. [85.230.190.116]) by smtp.gmail.com with ESMTPSA id q11sm1079576lfc.92.2019.01.16.02.23.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 02:23:40 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.91) (envelope-from ) id 1gjiMH-0007vm-QY; Wed, 16 Jan 2019 11:23:41 +0100 From: Johan Hovold To: Hauke Mehrtens Cc: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable Subject: [PATCH 2/3] net: dsa: lantiq_gswip: fix OF child-node lookups Date: Wed, 16 Jan 2019 11:23:34 +0100 Message-Id: <20190116102335.30433-3-johan@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190116102335.30433-1-johan@kernel.org> References: <20190116102335.30433-1-johan@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use the new of_get_compatible_child() helper to look up child nodes to avoid ever matching non-child nodes elsewhere in the tree. Also fix up the related struct device_node leaks. Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") Cc: stable # 4.20 Cc: Hauke Mehrtens Signed-off-by: Johan Hovold Reviewed-by: Andrew Lunn Acked-by: Hauke Mehrtens --- drivers/net/dsa/lantiq_gswip.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c index b06c41c98de9..5792674dd4e4 100644 --- a/drivers/net/dsa/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq_gswip.c @@ -1069,10 +1069,10 @@ static int gswip_probe(struct platform_device *pdev) version = gswip_switch_r(priv, GSWIP_VERSION); /* bring up the mdio bus */ - gphy_fw_np = of_find_compatible_node(pdev->dev.of_node, NULL, - "lantiq,gphy-fw"); + gphy_fw_np = of_get_compatible_child(dev->of_node, "lantiq,gphy-fw"); if (gphy_fw_np) { err = gswip_gphy_fw_list(priv, gphy_fw_np, version); + of_node_put(gphy_fw_np); if (err) { dev_err(dev, "gphy fw probe failed\n"); return err; @@ -1080,13 +1080,12 @@ static int gswip_probe(struct platform_device *pdev) } /* bring up the mdio bus */ - mdio_np = of_find_compatible_node(pdev->dev.of_node, NULL, - "lantiq,xrx200-mdio"); + mdio_np = of_get_compatible_child(dev->of_node, "lantiq,xrx200-mdio"); if (mdio_np) { err = gswip_mdio(priv, mdio_np); if (err) { dev_err(dev, "mdio probe failed\n"); - goto gphy_fw; + goto put_mdio_node; } } @@ -1115,7 +1114,8 @@ static int gswip_probe(struct platform_device *pdev) mdio_bus: if (mdio_np) mdiobus_unregister(priv->ds->slave_mii_bus); -gphy_fw: +put_mdio_node: + of_node_put(mdio_np); for (i = 0; i < priv->num_gphy_fw; i++) gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]); return err; @@ -1134,8 +1134,10 @@ static int gswip_remove(struct platform_device *pdev) dsa_unregister_switch(priv->ds); - if (priv->ds->slave_mii_bus) + if (priv->ds->slave_mii_bus) { mdiobus_unregister(priv->ds->slave_mii_bus); + of_node_put(priv->ds->slave_mii_bus->dev.of_node); + } for (i = 0; i < priv->num_gphy_fw; i++) gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]); From patchwork Wed Jan 16 10:23:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 1025748 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fjwy47l3z9sCX for ; Wed, 16 Jan 2019 21:24:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389129AbfAPKX7 (ORCPT ); Wed, 16 Jan 2019 05:23:59 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:40722 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389494AbfAPKXq (ORCPT ); Wed, 16 Jan 2019 05:23:46 -0500 Received: by mail-lf1-f65.google.com with SMTP id v5so4437087lfe.7; Wed, 16 Jan 2019 02:23:45 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=i9EBQmXkMNBYjjztGyv3wx7NdVyHDMd7kO+rKlttGLE=; b=kkLHzJ00TwNmFhbXq4OLPrfLbKq9G4P6M1rc3Q93jKQ4z1kXHpMR10Lv6yIHfk1SWk XNThPh22hneCiZ2l4W70Jw2rDVhvquMS5HYiycLfDsSixJ6RGxp460h88/ts5jkwogtv 3VrOrnozPGvjcPlebPVQMQEJDA7Jg3kSaDvwuO6M+91FVYDtzblnbnzA++67lzeAkU5/ 9zLY7h6VIG1qmlgPIxAT1SPCKHy1H4p5tQel06qqLQ2Rj33tioZz/hoya/Xvp/foNNjL 7uS5Tpq/HuO0PqhdKd6OSQoDen3fMQlJbswJcrKS7nfHWlwigy5e2ptvriQiwsHCBE31 UIaw== X-Gm-Message-State: AJcUuke/cDUqZtFrnAsz/1smtWLYwm0+nrub0qDWQsyBuKQsIy+3b4dR EM6pxnciCmDb7q62ct86UmE= X-Google-Smtp-Source: ALg8bN7yIMFMCBA2f5c/mOOOSy8yRqgip1DOVfs5fuddLh4zuAEBYYqsJRS/Gq//4z0DGx3SE5gOuA== X-Received: by 2002:a19:4f0c:: with SMTP id d12mr6095572lfb.121.1547634224443; Wed, 16 Jan 2019 02:23:44 -0800 (PST) Received: from xi.terra (c-74bee655.07-184-6d6c6d4.bbcust.telenor.se. [85.230.190.116]) by smtp.gmail.com with ESMTPSA id 1-v6sm942115lju.61.2019.01.16.02.23.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 02:23:40 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.91) (envelope-from ) id 1gjiMH-0007vq-T4; Wed, 16 Jan 2019 11:23:41 +0100 From: Johan Hovold To: Hauke Mehrtens Cc: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 3/3] net: dsa: lantiq_gswip: drop bogus drvdata check Date: Wed, 16 Jan 2019 11:23:35 +0100 Message-Id: <20190116102335.30433-4-johan@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190116102335.30433-1-johan@kernel.org> References: <20190116102335.30433-1-johan@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The platform-device driver data is set on successful probe and will never be NULL on remove (or we have much bigger problems). Signed-off-by: Johan Hovold Reviewed-by: Andrew Lunn Acked-by: Hauke Mehrtens --- drivers/net/dsa/lantiq_gswip.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c index 5792674dd4e4..27d092cab40e 100644 --- a/drivers/net/dsa/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq_gswip.c @@ -1126,9 +1126,6 @@ static int gswip_remove(struct platform_device *pdev) struct gswip_priv *priv = platform_get_drvdata(pdev); int i; - if (!priv) - return 0; - /* disable the switch */ gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);