{"id":814916,"url":"http://patchwork.ozlabs.org/api/1.2/patches/814916/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170918130408.23114-4-antoine.tenart@free-electrons.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918130408.23114-4-antoine.tenart@free-electrons.com>","list_archive_url":null,"date":"2017-09-18T13:04:08","name":"[net,3/3] net: mvpp2: fix port list indexing","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"b018a66d977bb8856bb81a2a9d467fda5e2990b7","submitter":{"id":61603,"url":"http://patchwork.ozlabs.org/api/1.2/people/61603/?format=json","name":"Antoine Tenart","email":"antoine.tenart@free-electrons.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170918130408.23114-4-antoine.tenart@free-electrons.com/mbox/","series":[{"id":3642,"url":"http://patchwork.ozlabs.org/api/1.2/series/3642/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3642","date":"2017-09-18T13:04:06","name":"net: mvpp2: various fixes","version":1,"mbox":"http://patchwork.ozlabs.org/series/3642/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814916/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814916/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwmTl73bZz9s3w\n\tfor ;\n\tMon, 18 Sep 2017 23:06:03 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754900AbdIRNFw (ORCPT );\n\tMon, 18 Sep 2017 09:05:52 -0400","from mail.free-electrons.com ([62.4.15.54]:35894 \"EHLO\n\tmail.free-electrons.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752728AbdIRNFD (ORCPT\n\t); Mon, 18 Sep 2017 09:05:03 -0400","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 5C8AF20F2C; Mon, 18 Sep 2017 15:05:02 +0200 (CEST)","from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr\n\t[90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 2EFA420985;\n\tMon, 18 Sep 2017 15:05:02 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","From":"Antoine Tenart ","To":"davem@davemloft.net","Cc":"Yan Markman , andrew@lunn.ch,\n\tgregory.clement@free-electrons.com, thomas.petazzoni@free-electrons.com,\n\tmiquel.raynal@free-electrons.com, nadavh@marvell.com,\n\tlinux@armlinux.org.uk, linux-kernel@vger.kernel.org,\n\tmw@semihalf.com, stefanc@marvell.com, netdev@vger.kernel.org,\n\tAntoine Tenart ","Subject":"[PATCH net 3/3] net: mvpp2: fix port list indexing","Date":"Mon, 18 Sep 2017 15:04:08 +0200","Message-Id":"<20170918130408.23114-4-antoine.tenart@free-electrons.com>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170918130408.23114-1-antoine.tenart@free-electrons.com>","References":"<20170918130408.23114-1-antoine.tenart@free-electrons.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Yan Markman \n\nThe private port_list array has a list of pointers to mvpp2_port\ninstances. This list is allocated given the number of ports enabled in\nthe device tree, but the pointers are set using the port-id property. If\non a single port is enabled, the port_list array will be of size 1, but\nwhen registering the port, if its id is not 0 the driver will crash.\nOther crashes were encountered in various situations.\n\nThis fixes the issue by using an index not equal to the value of the\nport-id property.\n\nFixes: 3f518509dedc (\"ethernet: Add new driver for Marvell Armada 375 network unit\")\nSigned-off-by: Antoine Tenart \n---\n drivers/net/ethernet/marvell/mvpp2.c | 8 +++++---\n 1 file changed, 5 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c\nindex 56d474414cfa..e7889464e97e 100644\n--- a/drivers/net/ethernet/marvell/mvpp2.c\n+++ b/drivers/net/ethernet/marvell/mvpp2.c\n@@ -7504,7 +7504,7 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,\n /* Ports initialization */\n static int mvpp2_port_probe(struct platform_device *pdev,\n \t\t\t struct device_node *port_node,\n-\t\t\t struct mvpp2 *priv)\n+\t\t\t struct mvpp2 *priv, int index)\n {\n \tstruct device_node *phy_node;\n \tstruct phy *comphy;\n@@ -7678,7 +7678,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,\n \t}\n \tnetdev_info(dev, \"Using %s mac address %pM\\n\", mac_from, dev->dev_addr);\n \n-\tpriv->port_list[id] = port;\n+\tpriv->port_list[index] = port;\n \treturn 0;\n \n err_free_port_pcpu:\n@@ -8029,10 +8029,12 @@ static int mvpp2_probe(struct platform_device *pdev)\n \t}\n \n \t/* Initialize ports */\n+\ti = 0;\n \tfor_each_available_child_of_node(dn, port_node) {\n-\t\terr = mvpp2_port_probe(pdev, port_node, priv);\n+\t\terr = mvpp2_port_probe(pdev, port_node, priv, i);\n \t\tif (err < 0)\n \t\t\tgoto err_mg_clk;\n+\t\ti++;\n \t}\n \n \tplatform_set_drvdata(pdev, priv);\n","prefixes":["net","3/3"]}