From: Stricted <info@stricted.net>
Date: Wed, 21 Mar 2018 21:45:35 +0000 (+0100)
Subject: Merge tag 'v3.10.81' into update
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eabf5dacf4ca362b9e868dbe1cdc3f5ece278165;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge tag 'v3.10.81' into update

This is the 3.10.81 stable release
---

eabf5dacf4ca362b9e868dbe1cdc3f5ece278165
diff --cc net/unix/af_unix.c
index 9b13da4e644d,123c16419cbe..8ccc661efa53
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@@ -2122,8 -1896,12 +2122,12 @@@ static long unix_stream_data_wait(struc
  
  		set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
  		unix_state_unlock(sk);
 -		timeo = schedule_timeout(timeo);
 +		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);
  	}