| Message ID | 20221209235242.480344-1-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e095493091e850d5292ad01d8fbf5cde1d89ac53 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: dsa: tag_8021q: avoid leaking ctx on dsa_tag_8021q_register() error path | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Sat, 10 Dec 2022 01:52:42 +0200 you wrote: > If dsa_tag_8021q_setup() fails, for example due to the inability of the > device to install a VLAN, the tag_8021q context of the switch will leak. > Make sure it is freed on the error path. > > Fixes: 328621f6131f ("net: dsa: tag_8021q: absorb dsa_8021q_setup into dsa_tag_8021q_{,un}register") > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> > > [...] Here is the summary with links: - [net] net: dsa: tag_8021q: avoid leaking ctx on dsa_tag_8021q_register() error path https://git.kernel.org/netdev/net/c/e095493091e8 You are awesome, thank you!
diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c index b1263917fcb2..5ee9ef00954e 100644 --- a/net/dsa/tag_8021q.c +++ b/net/dsa/tag_8021q.c @@ -415,6 +415,7 @@ static void dsa_tag_8021q_teardown(struct dsa_switch *ds) int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto) { struct dsa_8021q_context *ctx; + int err; ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -427,7 +428,15 @@ int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto) ds->tag_8021q_ctx = ctx; - return dsa_tag_8021q_setup(ds); + err = dsa_tag_8021q_setup(ds); + if (err) + goto err_free; + + return 0; + +err_free: + kfree(ctx); + return err; } EXPORT_SYMBOL_GPL(dsa_tag_8021q_register);
If dsa_tag_8021q_setup() fails, for example due to the inability of the device to install a VLAN, the tag_8021q context of the switch will leak. Make sure it is freed on the error path. Fixes: 328621f6131f ("net: dsa: tag_8021q: absorb dsa_8021q_setup into dsa_tag_8021q_{,un}register") Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- net/dsa/tag_8021q.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)