net: dsa: felix: Fix memory leak in felix_setup_mmio_filtering

JoseExposito · kuba-moo · commit e8b1d7698038 · 2021-12-09T08:09:28.000-08:00
Avoid a memory leak if there is not a CPU port defined. Fixes: 8d5f795 ("net: dsa: felix: break at first CPU port during init and teardown") Addresses-Coverity-ID: 1492897 ("Resource leak") Addresses-Coverity-ID: 1492899 ("Resource leak") Signed-off-by: José Expósito <jose.exposito89@gmail.com> Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Link: https://lore.kernel.org/r/20211209110538.11585-1-jose.exposito89@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
@@ -290,8 +290,11 @@ static int felix_setup_mmio_filtering(struct felix *felix)
 		}
 	}
 
-	if (cpu < 0)
+	if (cpu < 0) {
+		kfree(tagging_rule);
+		kfree(redirect_rule);
 		return -EINVAL;
+	}
 
 	tagging_rule->key_type = OCELOT_VCAP_KEY_ETYPE;
 	*(__be16 *)tagging_rule->key.etype.etype.value = htons(ETH_P_1588);

Original file line number	Diff line number	Diff line change
`@@ -290,8 +290,11 @@ static int felix_setup_mmio_filtering(struct felix *felix)`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`
`293`		`- if (cpu < 0)`
	`293`	`+ if (cpu < 0) {`
	`294`	`+ kfree(tagging_rule);`
	`295`	`+ kfree(redirect_rule);`
`294`	`296`	`return -EINVAL;`
	`297`	`+ }`
`295`	`298`
`296`	`299`	`tagging_rule->key_type = OCELOT_VCAP_KEY_ETYPE;`
`297`	`300`	`(__be16 )tagging_rule->key.etype.etype.value = htons(ETH_P_1588);`