瀏覽代碼

bpf: sockmap add missing rcu_read_(un)lock in smap_data_ready

References to psock must be done inside RCU critical section.

Fixes: 174a79ff9515 ("bpf: sockmap with sk redirect support")
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
John Fastabend 8 年之前
父節點
當前提交
d26e597d87
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6 3
      kernel/bpf/sockmap.c

+ 6 - 3
kernel/bpf/sockmap.c

@@ -227,11 +227,14 @@ static void smap_data_ready(struct sock *sk)
 {
 {
 	struct smap_psock *psock;
 	struct smap_psock *psock;
 
 
-	write_lock_bh(&sk->sk_callback_lock);
+	rcu_read_lock();
 	psock = smap_psock_sk(sk);
 	psock = smap_psock_sk(sk);
-	if (likely(psock))
+	if (likely(psock)) {
+		write_lock_bh(&sk->sk_callback_lock);
 		strp_data_ready(&psock->strp);
 		strp_data_ready(&psock->strp);
-	write_unlock_bh(&sk->sk_callback_lock);
+		write_unlock_bh(&sk->sk_callback_lock);
+	}
+	rcu_read_unlock();
 }
 }
 
 
 static void smap_tx_work(struct work_struct *w)
 static void smap_tx_work(struct work_struct *w)