diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-03 21:00:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-03 21:00:17 -0700 |
| commit | 6f41617bf23a17d9cb7cc6ca8161534f05f80293 (patch) | |
| tree | 2844d8d197a61b0603e31f09613e3272635dd1cc /net/dccp/input.c | |
| parent | 7bdaae270cb55d40b7fb73744c7e00a7108ee5b6 (diff) | |
| parent | cec4de302c5ff2c5eb3bfcb0c4845a095f5149b9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net'
overlapped the renaming of a netlink attribute in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/input.c')
| -rw-r--r-- | net/dccp/input.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c index d28d46bff6ab..85d6c879383d 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c @@ -606,11 +606,13 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, if (sk->sk_state == DCCP_LISTEN) { if (dh->dccph_type == DCCP_PKT_REQUEST) { /* It is possible that we process SYN packets from backlog, - * so we need to make sure to disable BH right there. + * so we need to make sure to disable BH and RCU right there. */ + rcu_read_lock(); local_bh_disable(); acceptable = inet_csk(sk)->icsk_af_ops->conn_request(sk, skb) >= 0; local_bh_enable(); + rcu_read_unlock(); if (!acceptable) return 1; consume_skb(skb); |