diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-03 01:55:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-03 01:55:42 +0200 |
| commit | 0585df468e8f4481b78256a2bf09449290bfcbf3 (patch) | |
| tree | 11ef60d0771ceb6c50c170e1d6e9be3014de8f35 /drivers/media/rc/bpf-lirc.c | |
| parent | Merge tag 'arc-4.18-final' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff) | |
| parent | media: v4l: vsp1: Fix deadlock in VSPDL DRM pipelines (diff) | |
| download | linux-0585df468e8f4481b78256a2bf09449290bfcbf3.tar.xz linux-0585df468e8f4481b78256a2bf09449290bfcbf3.zip | |
Merge tag 'media/v4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- a deadlock regression at vsp1 driver
- some Remote Controller fixes related to the new BPF filter logic
added on it for Kernel 4.18.
* tag 'media/v4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: v4l: vsp1: Fix deadlock in VSPDL DRM pipelines
media: rc: read out of bounds if bpf reports high protocol number
media: bpf: ensure bpf program is freed on detach
media: rc: be less noisy when driver misbehaves
Diffstat (limited to 'drivers/media/rc/bpf-lirc.c')
| -rw-r--r-- | drivers/media/rc/bpf-lirc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/rc/bpf-lirc.c b/drivers/media/rc/bpf-lirc.c index fcfab6635f9c..81b150e5dfdb 100644 --- a/drivers/media/rc/bpf-lirc.c +++ b/drivers/media/rc/bpf-lirc.c @@ -174,6 +174,7 @@ static int lirc_bpf_detach(struct rc_dev *rcdev, struct bpf_prog *prog) rcu_assign_pointer(raw->progs, new_array); bpf_prog_array_free(old_array); + bpf_prog_put(prog); unlock: mutex_unlock(&ir_raw_handler_lock); return ret; |