diff options
| author | Jan Hoffmann <jan@3e8.eu> | 2023-02-08 22:53:32 +0100 |
|---|---|---|
| committer | Sander Vanheule <sander@svanheule.net> | 2023-02-13 12:14:16 +0100 |
| commit | 65b2bcbf5f0037f24e3772b2c96de03230fdaaf7 (patch) | |
| tree | 2f5ab120e1490dd2d1e964396bb70967471d4951 /target/linux/realtek/files-5.15 | |
| parent | 1352e5da8dd722be9fdb3c8f5d616a553d529831 (diff) | |
| download | upstream-65b2bcbf5f0037f24e3772b2c96de03230fdaaf7.tar.gz upstream-65b2bcbf5f0037f24e3772b2c96de03230fdaaf7.tar.bz2 upstream-65b2bcbf5f0037f24e3772b2c96de03230fdaaf7.zip | |
realtek: fix memory leak in netevent handler
The net_event_work struct is allocated, but only freed in a single case.
Move the allocation to the branch where it is actually needed, and free
it after the work has been done.
Fixes: 03e1d93e0779 ("realtek: add driver support for routing offload")
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
Diffstat (limited to 'target/linux/realtek/files-5.15')
| -rw-r--r-- | target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/common.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/common.c index 1fa92ae220..3216d7eb83 100644 --- a/target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/common.c +++ b/target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/common.c @@ -1282,6 +1282,8 @@ static void rtl83xx_net_event_work_do(struct work_struct *work) struct rtl838x_switch_priv *priv = net_work->priv; rtl83xx_l3_nexthop_update(priv, net_work->gw_addr, net_work->mac); + + kfree(net_work); } static int rtl83xx_netevent_event(struct notifier_block *this, @@ -1295,13 +1297,6 @@ static int rtl83xx_netevent_event(struct notifier_block *this, priv = container_of(this, struct rtl838x_switch_priv, ne_nb); - net_work = kzalloc(sizeof(*net_work), GFP_ATOMIC); - if (!net_work) - return NOTIFY_BAD; - - INIT_WORK(&net_work->work, rtl83xx_net_event_work_do); - net_work->priv = priv; - switch (event) { case NETEVENT_NEIGH_UPDATE: if (n->tbl != &arp_tbl) @@ -1310,10 +1305,16 @@ static int rtl83xx_netevent_event(struct notifier_block *this, port = rtl83xx_port_dev_lower_find(dev, priv); if (port < 0 || !(n->nud_state & NUD_VALID)) { pr_debug("%s: Neigbour invalid, not updating\n", __func__); - kfree(net_work); return NOTIFY_DONE; } + net_work = kzalloc(sizeof(*net_work), GFP_ATOMIC); + if (!net_work) + return NOTIFY_BAD; + + INIT_WORK(&net_work->work, rtl83xx_net_event_work_do); + net_work->priv = priv; + net_work->mac = ether_addr_to_u64(n->ha); net_work->gw_addr = *(__be32 *) n->primary_key; |