diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-17 10:23:49 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-17 10:23:49 -0800 |
| commit | 949610ddd0ea61187beec2b27e70a34432ed333f (patch) | |
| tree | 485f4c0e773f70e8157a2d1ebbbaec5a9f609eb0 /kernel | |
| parent | 1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8 (diff) | |
| parent | d0fbb51dfaa612f960519b798387be436e8f83c5 (diff) | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/offload.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index ba635209ae9a..5b9da0954a27 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -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); |