]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: mvpp2: cls: Fix memory leak in mvpp2_ethtool_cls_rule_ins()
authorZilin Guan <zilin@seu.edu.cn>
Fri, 23 Jan 2026 06:57:16 +0000 (06:57 +0000)
committerJakub Kicinski <kuba@kernel.org>
Sun, 25 Jan 2026 21:04:16 +0000 (13:04 -0800)
In mvpp2_ethtool_cls_rule_ins(), the ethtool_rule is allocated by
ethtool_rx_flow_rule_create(). If the subsequent conversion to flow
type fails, the function jumps to the clean_rule label.

However, the clean_rule label only frees efs, skipping the cleanup
of ethtool_rule, which leads to a memory leak.

Fix this by jumping to the clean_eth_rule label, which properly calls
ethtool_rx_flow_rule_destroy() before freeing efs.

Compile tested only. Issue found using a prototype static analysis tool
and code review.

Fixes: f4f1ba18195d ("net: mvpp2: cls: Report an error for unsupported flow types")
Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/20260123065716.2248324-1-zilin@seu.edu.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c

index 44b201817d94c655fd76e3dfab0bc8228d57f14a..c116da7d7f18c819b638a2ca10009c4b67110509 100644 (file)
@@ -1389,7 +1389,7 @@ int mvpp2_ethtool_cls_rule_ins(struct mvpp2_port *port,
        efs->rule.flow_type = mvpp2_cls_ethtool_flow_to_type(info->fs.flow_type);
        if (efs->rule.flow_type < 0) {
                ret = efs->rule.flow_type;
-               goto clean_rule;
+               goto clean_eth_rule;
        }
 
        ret = mvpp2_cls_rfs_parse_rule(&efs->rule);