Commit 949610dd authored Nov 17, 2019 by David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf



Daniel Borkmann says:

====================
pull-request: bpf 2019-11-15

The following pull-request contains BPF updates for your *net* tree.

We've added 1 non-merge commits during the last 9 day(s) which contain
a total of 1 file changed, 3 insertions(+), 1 deletion(-).

The main changes are:

1) Fix a missing unlock of bpf_devs_lock in bpf_offload_dev_create()'s
    error path, from Dan.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 1d4c79ed d0fbb51d

kernel/bpf/offload.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -678,8 +678,10 @@ bpf_offload_dev_create(const struct bpf_prog_offload_ops ops, void priv)
		down_write(&bpf_devs_lock);
		if (!offdevs_inited) {
		err = rhashtable_init(&offdevs, &offdevs_params);
		if (err)
		if (err) {
		up_write(&bpf_devs_lock);
		return ERR_PTR(err);
		}
		offdevs_inited = true;
		}
		up_write(&bpf_devs_lock);

Admin message