Browse Source

bpf: sockmap missing NULL psock check

Add psock NULL check to handle a racing sock event that can get the
sk_callback_lock before this case but after xchg happens causing the
refcnt to hit zero and sock user data (psock) to be null and queued
for garbage collection.

Also add a comment in the code because this is a bit subtle and
not obvious in my opinion.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
John Fastabend 7 năm trước cách đây
mục cha
commit
5731a879d0
1 tập tin đã thay đổi với 9 bổ sung2 xóa
  1. 9 2
      kernel/bpf/sockmap.c

+ 9 - 2
kernel/bpf/sockmap.c

@@ -591,8 +591,15 @@ static void sock_map_free(struct bpf_map *map)
 
 
 		write_lock_bh(&sock->sk_callback_lock);
 		write_lock_bh(&sock->sk_callback_lock);
 		psock = smap_psock_sk(sock);
 		psock = smap_psock_sk(sock);
-		smap_list_remove(psock, &stab->sock_map[i]);
-		smap_release_sock(psock, sock);
+		/* This check handles a racing sock event that can get the
+		 * sk_callback_lock before this case but after xchg happens
+		 * causing the refcnt to hit zero and sock user data (psock)
+		 * to be null and queued for garbage collection.
+		 */
+		if (likely(psock)) {
+			smap_list_remove(psock, &stab->sock_map[i]);
+			smap_release_sock(psock, sock);
+		}
 		write_unlock_bh(&sock->sk_callback_lock);
 		write_unlock_bh(&sock->sk_callback_lock);
 	}
 	}
 	rcu_read_unlock();
 	rcu_read_unlock();