Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed2b82c0 authored by Mauricio Vasquez B's avatar Mauricio Vasquez B Committed by Daniel Borkmann
Browse files

bpf: hash map: decrement counter on error 



Decrement the number of elements in the map in case the allocation
of a new node fails.

Fixes: 6c905981 ("bpf: pre-allocate hash map elements")
Signed-off-by: default avatarMauricio Vasquez B <mauricio.vasquez@polito.it>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 39d393cf

kernel/bpf/hashtab.c

+11 −5
Original line number Diff line number Diff line
@@ -747,13 +747,15 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, 
				 * old element will be freed immediately.

				 * Otherwise return an error

				 */

				atomic_dec(&htab->count);

				return ERR_PTR(-E2BIG);

				l_new = ERR_PTR(-E2BIG);

				goto dec_count;

			}

		l_new = kmalloc_node(htab->elem_size, GFP_ATOMIC | __GFP_NOWARN,

				     htab->map.numa_node);

		if (!l_new)

			return ERR_PTR(-ENOMEM);

		if (!l_new) {

			l_new = ERR_PTR(-ENOMEM);

			goto dec_count;

		}

	}



	memcpy(l_new->key, key, key_size);
@@ -766,7 +768,8 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, 
						  GFP_ATOMIC | __GFP_NOWARN);

			if (!pptr) {

				kfree(l_new);

				return ERR_PTR(-ENOMEM);

				l_new = ERR_PTR(-ENOMEM);

				goto dec_count;

			}

		}
@@ -780,6 +783,9 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, 


	l_new->hash = hash;

	return l_new;

dec_count:

	atomic_dec(&htab->count);

	return l_new;

}



static int check_flags(struct bpf_htab *htab, struct htab_elem *l_old,