From: Mark Salyzyn <salyzyn@android.com>
To: linux-kernel@vger.kernel.org
Cc: Hannes Frederic Sowa <hannes@redhat.com>,
Mark Salyzyn <salyzyn@android.com>,
Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>,
"David S. Miller" <davem@davemloft.net>,
Al Viro <viro@zeniv.linux.org.uk>,
David Howells <dhowells@redhat.com>,
Ying Xue <ying.xue@windriver.com>, Christoph Hellwig <hch@lst.de>,
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 [thread overview]
Message-ID: <1432306867-27009-1-git-send-email-salyzyn@android.com> (raw)
got a rare NULL pointer dereference in clear_bit
Signed-off-by: Mark Salyzyn <salyzyn@android.com>
----
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
reply other threads:[~2015-05-22 15:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1432306867-27009-1-git-send-email-salyzyn@android.com \
--to=salyzyn@android.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=dmitry.tarnyagin@lockless.no \
--cc=hannes@redhat.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=ying.xue@windriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).