Commit e029f541 authored Jan 26, 2018 by Jakub Kicinski Committed by Daniel Borkmann Feb 01, 2018

netdevsim: fix overflow on the error path



Undo loop condition on the error path would cause the i counter
to go below zero, if allocation failure happened with the first
(i.e. 0th) element of the array.

Fixes: 395cacb5 ("netdevsim: bpf: support fake map offload")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent b2fe5fa6

drivers/net/netdevsim/bpf.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -480,8 +480,7 @@ static int
		nsim_bpf_map_alloc(struct netdevsim ns, struct bpf_offloaded_map offmap)
		{
		struct nsim_bpf_bound_map *nmap;
		unsigned int i;
		int err;
		int i, err;

		if (WARN_ON(offmap->map.map_type != BPF_MAP_TYPE_ARRAY &&
		offmap->map.map_type != BPF_MAP_TYPE_HASH))
		@@ -518,7 +517,7 @@ nsim_bpf_map_alloc(struct netdevsim ns, struct bpf_offloaded_map offmap)
		return 0;

		err_free:
		while (--i) {
		while (--i >= 0) {
		kfree(nmap->entry[i].key);
		kfree(nmap->entry[i].value);
		}