Merge "af_unix: Guard against other == sk in unix_dgram_sendmsg" (94bb6728) · Commits · e / devices / android_kernel_xiaomi_markw

net/unix/af_unix.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1724,7 +1724,12 @@ restart_locked:
		goto out_unlock;
		}

		if (unlikely(unix_peer(other) != sk && unix_recvq_full(other))) {
		/* other == sk && unix_peer(other) != sk if
		* - unix_peer(sk) == NULL, destination address bound to sk
		* - unix_peer(sk) == sk by time of get but disconnected before lock
		*/
		if (other != sk &&
		unlikely(unix_peer(other) != sk && unix_recvq_full(other))) {
		if (timeo) {
		timeo = unix_wait_for_peer(other, timeo);