Re: [PATCH] net: mscc: ocelot: Fix mirror reference leak on VCAP aux resource error
From: Simon Horman <horms@kernel.org>
Date: 2026-09-21 10:46:28
Also in:
lkml, stable
Subsystem:
networking drivers, ocelot ethernet switch driver, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Vladimir Oltean, Linus Torvalds
On Thu, Sep 17, 2026 at 11:34:44AM +0000, Wentao Liang wrote:
quoted hunk ↗ jump to hunk
When ocelot_vcap_policer_add() fails, the aux resource setup returns without releasing the mirror reference taken earlier by ocelot_mirror_get(). The caller drops the filter without calling ocelot_vcap_filter_del_aux_resources(), so the reference is leaked. Release the mirror reference before returning the error. Fixes: c3d427eac90f ("net: mscc: ocelot: establish functions for handling VCAP aux resources") Cc: stable@vger.kernel.org Signed-off-by: Wentao Liang <redacted> --- drivers/net/ethernet/mscc/ocelot_vcap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)diff --git a/drivers/net/ethernet/mscc/ocelot_vcap.c b/drivers/net/ethernet/mscc/ocelot_vcap.c index 25e533e91d71..c479af2a423f 100644 --- a/drivers/net/ethernet/mscc/ocelot_vcap.c +++ b/drivers/net/ethernet/mscc/ocelot_vcap.c@@ -970,8 +970,11 @@ ocelot_vcap_filter_add_aux_resources(struct ocelot *ocelot, if (filter->block_id == VCAP_IS2 && filter->action.police_ena) { ret = ocelot_vcap_policer_add(ocelot, filter->action.pol_ix, &filter->action.pol); - if (ret) + if (ret) { + if (filter->action.mirror_ena) + ocelot_mirror_put(ocelot); return ret; + } } return 0;
I think this change would be somewhat more robust against future changes to this function if it was implemented using a goto-driven unwind ladder, which is the generally preferred in Networking code. Something like this (compile tested only!):
diff --git a/drivers/net/ethernet/mscc/ocelot_vcap.c b/drivers/net/ethernet/mscc/ocelot_vcap.c
index 25e533e91d71..ce4a3da38c58 100644
--- a/drivers/net/ethernet/mscc/ocelot_vcap.c
+++ b/drivers/net/ethernet/mscc/ocelot_vcap.c@@ -957,7 +957,7 @@ ocelot_vcap_filter_add_aux_resources(struct ocelot *ocelot, struct ocelot_vcap_filter *filter, struct netlink_ext_ack *extack) { - struct ocelot_mirror *m; + struct ocelot_mirror *m = NULL; int ret; if (filter->block_id == VCAP_IS2 && filter->action.mirror_ena) {
@@ -971,10 +971,15 @@ ocelot_vcap_filter_add_aux_resources(struct ocelot *ocelot, ret = ocelot_vcap_policer_add(ocelot, filter->action.pol_ix, &filter->action.pol); if (ret) - return ret; + goto err_mirror_put; } return 0; + +err_mirror_put: + if (m) + ocelot_mirror_put(ocelot); + return ret; } static void
--
pw-bot: changes-requested