2023-08-04 16:31:53

by Fedor Pchelkin

Subject: [PATCH net v2] drivers: vxlan: vnifilter: free percpu vni stats on error path

In case rhashtable_lookup_insert_fast() fails inside vxlan_vni_add(), the
allocated percpu vni stats are not freed on the error path.

Introduce vxlan_vni_free() which would work as a nice wrapper to free
vxlan_vni_node resources properly.

Found by Linux Verification Center (linuxtesting.org).

Fixes: 4095e0e1328a ("drivers: vxlan: vnifilter: per vni stats")
Suggested-by: Ido Schimmel <[email protected]>
Signed-off-by: Fedor Pchelkin <[email protected]>
---
v1->v2: per Ido Schimmel's suggestion, extract freeing vninode resources
into a separate function vxlan_vni_free() and tag the patch as for 'net'

drivers/net/vxlan/vxlan_vnifilter.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c
index a3de081cda5e..c3ff30ab782e 100644
--- a/drivers/net/vxlan/vxlan_vnifilter.c
+++ b/drivers/net/vxlan/vxlan_vnifilter.c
@@ -713,6 +713,12 @@ static struct vxlan_vni_node *vxlan_vni_alloc(struct vxlan_dev *vxlan,
return vninode;
}

+static void vxlan_vni_free(struct vxlan_vni_node *vninode)
+{
+ free_percpu(vninode->stats);
+ kfree(vninode);
+}
+
static int vxlan_vni_add(struct vxlan_dev *vxlan,
struct vxlan_vni_group *vg,
u32 vni, union vxlan_addr *group,
@@ -740,7 +746,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan,
&vninode->vnode,
vxlan_vni_rht_params);
if (err) {
- kfree(vninode);
+ vxlan_vni_free(vninode);
return err;
}

@@ -763,8 +769,7 @@ static void vxlan_vni_node_rcu_free(struct rcu_head *rcu)
struct vxlan_vni_node *v;

v = container_of(rcu, struct vxlan_vni_node, rcu);
- free_percpu(v->stats);
- kfree(v);
+ vxlan_vni_free(v);
}

static int vxlan_vni_del(struct vxlan_dev *vxlan,
--
2.41.0

2023-08-06 16:54:45

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net v2] drivers: vxlan: vnifilter: free percpu vni stats on error path

Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:

On Fri, 4 Aug 2023 18:53:36 +0300 you wrote:
> In case rhashtable_lookup_insert_fast() fails inside vxlan_vni_add(), the
> allocated percpu vni stats are not freed on the error path.
>
> Introduce vxlan_vni_free() which would work as a nice wrapper to free
> vxlan_vni_node resources properly.
>
> Found by Linux Verification Center (linuxtesting.org).
>
> [...]

Here is the summary with links:
- [net,v2] drivers: vxlan: vnifilter: free percpu vni stats on error path
https://git.kernel.org/netdev/net/c/b1c936e9af5d

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html