Commit 0d8f72d3 authored by Hou Tao's avatar Hou Tao Committed by cuiyudong
Browse files

bpf: Remove unnecessary kfree(im_node) in lpm_trie_update_elem 

stable inclusion
from stable-v6.6.66
commit c1ab31edd258ebd83bfd7b41eb916766a7a35081
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBLUBO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c1ab31edd258ebd83bfd7b41eb916766a7a35081



--------------------------------

There is no need to call kfree(im_node) when updating element fails,
because im_node must be NULL. Remove the unnecessary kfree() for
im_node.

Reviewed-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20241206110622.1161752-3-houtao@huaweicloud.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Conflicts:
kernel/bpf/lpm_trie.c
Signed-off-by: default avatarcuiyudong <cuiyudong@kylinos.cn>
parent 4f21be79

kernel/bpf/lpm_trie.c

+2 −5
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static long trie_update_elem(struct bpf_map *map, 
			     void *_key, void *value, u64 flags)

{

	struct lpm_trie *trie = container_of(map, struct lpm_trie, map);

	struct lpm_trie_node *node, *im_node = NULL, *new_node = NULL;

	struct lpm_trie_node *node, *im_node, *new_node = NULL;

	struct lpm_trie_node *free_node = NULL;

	struct lpm_trie_node __rcu **slot;

	struct bpf_lpm_trie_key_u8 *key = _key;
@@ -440,11 +440,8 @@ static long trie_update_elem(struct bpf_map *map, 
	rcu_assign_pointer(*slot, im_node);



out:

	if (ret) {

	if (ret)

		kfree(new_node);

		kfree(im_node);

	}



	spin_unlock_irqrestore(&trie->lock, irq_flags);

	kfree_rcu(free_node, rcu);