Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a77be819 authored by Kyle Moffett's avatar Kyle Moffett Committed by David S. Miller
Browse files

[NET]: Fix setsockopt locking bug 



On Sparc, SO_DONTLINGER support resulted in sock_reset_flag being 
called without lock_sock().

Signed-off-by: default avatarKyle Moffett <mrmacman_g4@mac.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cbcd2a4c

net/core/sock.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -206,9 +206,10 @@ int sock_setsockopt(struct socket *sock, int level, int optname, 
	 */

	 */





#ifdef SO_DONTLINGER		/* Compatibility item... */

#ifdef SO_DONTLINGER		/* Compatibility item... */

	switch (optname) {

	if (optname == SO_DONTLINGER) {

		case SO_DONTLINGER:

		lock_sock(sk);

		sock_reset_flag(sk, SOCK_LINGER);

		sock_reset_flag(sk, SOCK_LINGER);

		release_sock(sk);

		return 0;

		return 0;

	}

	}

#endif

#endif