Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2019-03-02 12:54:35 -08:00
parent cf29576fee 07f12b26e2
commit 9eb359140c
51 changed files with 409 additions and 107 deletions
--- a/net/socket.c
+++ b/net/socket.c
@@ -577,6 +577,7 @@ static void __sock_release(struct socket *sock, struct inode *inode)
 		if (inode)
 			inode_lock(inode);
 		sock->ops->release(sock);
+		sock->sk = NULL;
 		if (inode)
 			inode_unlock(inode);
 		sock->ops = NULL;