diff options
| author | Jann Horn | 2018-06-25 17:22:00 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2018-06-26 16:48:40 +0200 |
| commit | ce00bf07cc95a57cd20b208e02b3c2604e532ae8 (patch) | |
| tree | 84e98d9b5c39e5655d98abd3fc4e419f89e4969f /net/netfilter/nf_conncount.c | |
| parent | netfilter: nf_log: fix uninit read in nf_log_proc_dostring (diff) | |
| download | kernel-qcow2-linux-ce00bf07cc95a57cd20b208e02b3c2604e532ae8.tar.gz kernel-qcow2-linux-ce00bf07cc95a57cd20b208e02b3c2604e532ae8.tar.xz kernel-qcow2-linux-ce00bf07cc95a57cd20b208e02b3c2604e532ae8.zip | |
netfilter: nf_log: don't hold nf_log_mutex during user access
The old code would indefinitely block other users of nf_log_mutex if
a userspace access in proc_dostring() blocked e.g. due to a userfaultfd
region. Fix it by moving proc_dostring() out of the locked region.
This is a followup to commit 266d07cb1c9a ("netfilter: nf_log: fix
sleeping function called from invalid context"), which changed this code
from using rcu_read_lock() to taking nf_log_mutex.
Fixes: 266d07cb1c9a ("netfilter: nf_log: fix sleeping function calle[...]")
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conncount.c')
0 files changed, 0 insertions, 0 deletions