From:   Yevhen Orlov <yevhen.orlov@plvision.eu>
To:     netdev@vger.kernel.org
Cc:     Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>,
        Taras Chornyi <taras.chornyi@plvision.eu>,
        Mickey Rachamim <mickeyr@marvell.com>,
        Serhiy Pshyk <serhiy.pshyk@plvision.eu>,
        Yevhen Orlov <yevhen.orlov@plvision.eu>,
        Taras Chornyi <tchornyi@marvell.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Andrii Savka <andrii.savka@plvision.eu>,
        Oleksandr Mazur <oleksandr.mazur@plvision.eu>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net] net: marvell: prestera: fix incorrect return of port_find
Date:   Thu, 16 Dec 2021 19:07:36 +0200
Message-Id: <20211216170736.8851-1-yevhen.orlov@plvision.eu>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZyGHooGle4C9Ej1N9wvydly0Y1w9lDJ8llDyti33OWg8dohMpoxcFjdnIwwi?=
 =?us-ascii?Q?AycYolilTSBu4POLG0/4RUHB2QnCIlkLIjv//MxKm+p6h8+dr2/lmMvIvKEk?=
 =?us-ascii?Q?JGQwy4WHzM/fMizvtmHWHAN/64FRl4BiNu8nEemoDkwT9SLkQ+KMPRlAOyRl?=
 =?us-ascii?Q?ZOiVdUZRg8r9HbGWq5xS7wZtKxIC7IYv0JA68nm29qfZPNIho4xngkJlurS8?=
 =?us-ascii?Q?C1dJ8dRUcGi1P3xg0OcludSvCCmR4ALz/UmYlJSruGOXmFF6FqU/KQE6/Ib7?=
 =?us-ascii?Q?uL2jfqg75QL2SFaIf2mi0noGHoyon0jafcvE+fDnQt/V3jbnQukgwN/ocMXq?=
 =?us-ascii?Q?ksdbyJPTcLbjH/f57uFAekitgqpt5xc8FGUlcSgEH9Z38wlPJaXhBo8w/S4c?=
 =?us-ascii?Q?9aoJO5rOZpeiMKmixs45ZAmwftdG6R38mX5JjrrB7IToLLOnPXtMhpAuZu3Z?=
 =?us-ascii?Q?lHwTm7SJPoNqHJauj2lNyxlBzapFapBLdW2W99wGtosO/CR8hQuzfRkn6ax3?=
 =?us-ascii?Q?rwgD+eSYH+rUXUIbVsUbEKo8tFvArddItZNknxJ8TY/CUeH/ooFXK+LTq8ox?=
 =?us-ascii?Q?1LY6bnHbYQSTlXJvqW1qiRNVj/mU6pyWiwPFqp23VtrIyj7VjSy6uXfJjlAL?=
 =?us-ascii?Q?BZyXOm1dXQPO5tU7FwpGV0c/IfP5yZXeCnJaB8RiYpUJ1ybQq/mlLqGLdjyZ?=
 =?us-ascii?Q?OD+QoGEz8L0DkzJ+SkKuBQfNebb37iYSjmAIOIsJTCS6BehWBOZHP3Z1ND3/?=
 =?us-ascii?Q?ecuPpuPTuYmOZdXUrOtKtglLlrxpYDmLYEyAL/paOfBPayH2+e1qRCFMEwGY?=
 =?us-ascii?Q?kTWnCfwWl66acmPKXKbo/m5ULI5zFaELsFioIDOa13H3PjnHt3Njk2qNEicA?=
 =?us-ascii?Q?pceNVY9pkfUDqE1gNFXGNS5/uUvE2Hn/H8JHzUvVwhobB5tJT7RLjCp2fsUx?=
 =?us-ascii?Q?J9kvXIYlCiVhNPfwDkE0I3SdrkJh3f6gBk3k/bltr7KTnMqDQRebcxIUh5Qg?=
 =?us-ascii?Q?jJaEGpMt8HhfmBw/nOQKkvt/dQT+YjauxHlCzFt9YB10VnEvQQg59EDGXwSF?=
 =?us-ascii?Q?f4sO8wPltFQJDPXDlPLGe/pwnZaLgQkTNoctL+cAAIWeFHfPc1VZM9neATfP?=
 =?us-ascii?Q?6GdZnRkzIUbF3qJpDCjyE7Icc3nGQFbTT3BhJqFwRHaR4PkGks9/Wt4oyWlU?=
 =?us-ascii?Q?Kxhd3MqMOSbi+fnvgM+eMUczHf1cmyBw1Mp6aNanY9so9vDl/LJyB3QsUd6U?=
 =?us-ascii?Q?fm3ROHwhNmQwDwdtUEl7S4uV23McHty5yla54hC6ktwX2QuLhJ+7ub6+3QY/?=
 =?us-ascii?Q?tsmjHhKsBtLP4QfF+t8dk/5UioLlmzXKJi3pZrU5pDf9x3FnIJANszbpUON2?=
 =?us-ascii?Q?3+S/UyeBdG65sZq3x0YjFfipis+pWZOZNSJLiKG5eELRsDEBEj/qkwqeiBOf?=
 =?us-ascii?Q?PziwfUjI2DwSNYyXj1+ed8aw1Cok1Sc0q9fGG1nRO136r6W0hnM0YFvZyuji?=
 =?us-ascii?Q?AcCA06I+NUXKaGpmauI+Fh503+GCKjxexh9oCzTGHtY2Z6pg2wHSPa0l5Aoe?=
 =?us-ascii?Q?TG0hegBaSkJeP0M40h7YGlc4STzomiYi4yGQtrXrkWMiGF/k+3t3eWdwuQgw?=
 =?us-ascii?Q?T9XeilHzqjeB7a6tkwiS7oKuhezerW6AqvGNU5MYWlKwlbWrafbKA8RFUYw1?=
 =?us-ascii?Q?hxgOQg=3D=3D?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: 8378a159-4cc4-489a-de2f-08d9c0b6c03a
X-MS-Exchange-CrossTenant-AuthSource: AM9P190MB1122.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 17:08:59.3749
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 03707b74-30f3-46b6-a0e0-ff0a7438c9c4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 3RP18+uj2BerEMbyXDnSnRns+cgmguvUatXNS+G8o1Q0U7PT9UkWc6usqD7NSiMZDhPdHQHx8iTAB9ueitFq4BsDZjZnYaqYmYJFQL4iKIo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P190MB1364
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In case, when some ports is in list and we don't find requested - we
return last iterator state and not return NULL as expected.

Fixes: 501ef3066c89 ("net: marvell: prestera: Add driver for Prestera family ASIC devices")
Signed-off-by: Yevhen Orlov <yevhen.orlov@plvision.eu>
---
 .../ethernet/marvell/prestera/prestera_main.c    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c b/drivers/net/ethernet/marvell/prestera/prestera_main.c
index a0dbad5cb88d..2a5029fe5c77 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_main.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c
@@ -55,12 +55,14 @@ int prestera_port_pvid_set(struct prestera_port *port, u16 vid)
 struct prestera_port *prestera_port_find_by_hwid(struct prestera_switch *sw,
 						 u32 dev_id, u32 hw_id)
 {
-	struct prestera_port *port = NULL;
+	struct prestera_port *port = NULL, *tmp;
 
 	read_lock(&sw->port_list_lock);
-	list_for_each_entry(port, &sw->port_list, list) {
-		if (port->dev_id == dev_id && port->hw_id == hw_id)
+	list_for_each_entry(tmp, &sw->port_list, list) {
+		if (tmp->dev_id == dev_id && tmp->hw_id == hw_id) {
+			port = tmp;
 			break;
+		}
 	}
 	read_unlock(&sw->port_list_lock);
 
@@ -69,12 +71,14 @@ struct prestera_port *prestera_port_find_by_hwid(struct prestera_switch *sw,
 
 struct prestera_port *prestera_find_port(struct prestera_switch *sw, u32 id)
 {
-	struct prestera_port *port = NULL;
+	struct prestera_port *port = NULL, *tmp;
 
 	read_lock(&sw->port_list_lock);
-	list_for_each_entry(port, &sw->port_list, list) {
-		if (port->id == id)
+	list_for_each_entry(tmp, &sw->port_list, list) {
+		if (tmp->id == id) {
+			port = tmp;
 			break;
+		}
 	}
 	read_unlock(&sw->port_list_lock);
 
-- 
2.17.1