From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757298AbbEVPB3 (ORCPT ); Fri, 22 May 2015 11:01:29 -0400 Received: from mail-ig0-f174.google.com ([209.85.213.174]:36403 "EHLO mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756233AbbEVPB1 (ORCPT ); Fri, 22 May 2015 11:01:27 -0400 From: Mark Salyzyn To: linux-kernel@vger.kernel.org Cc: Hannes Frederic Sowa , Mark Salyzyn , Dmitry Tarnyagin , "David S. Miller" , Al Viro , David Howells , Ying Xue , Christoph Hellwig , netdev@vger.kernel.org Subject: [PATCH v2] net/unix: sk_socket can disappear when state is unlocked Date: Fri, 22 May 2015 08:00:42 -0700 Message-Id: <1432306867-27009-1-git-send-email-salyzyn@android.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org got a rare NULL pointer dereference in clear_bit Signed-off-by: Mark Salyzyn ---- v2: switch to sock_flag(sk, SOCK_DEAD) and added net/caif/caif_socket.c net/caif/caif_socket.c | 4 ++++ net/unix/af_unix.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 4ec0c80..8f44c38 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -330,6 +330,10 @@ static long caif_stream_data_wait(struct sock *sk, long timeo) release_sock(sk); timeo = schedule_timeout(timeo); lock_sock(sk); + + if (sock_flag(sk, SOCK_DEAD)) + break; + clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); } diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 5266ea7..7b68dc8 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1880,6 +1880,10 @@ static long unix_stream_data_wait(struct sock *sk, long timeo, unix_state_unlock(sk); timeo = freezable_schedule_timeout(timeo); unix_state_lock(sk); + + if (sock_flag(sk, SOCK_DEAD)) + break; + clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); } -- 2.2.0.rc0.207.ga3a616c