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

Commit a36b5017 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.205 into android-4.9-q 



Changes in 4.9.205
	Revert "sock: Reset dst when changing sk_mark via setsockopt"
	Linux 4.9.205

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 72e85987 6620daa7

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 204

SUBLEVEL = 205

EXTRAVERSION =

NAME = Roaring Lionus

net/core/sock.c

+2 −4
Original line number Diff line number Diff line
@@ -945,12 +945,10 @@ int sock_setsockopt(struct socket *sock, int level, int optname, 
			clear_bit(SOCK_PASSSEC, &sock->flags);

		break;

	case SO_MARK:

		if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) {

		if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN))

			ret = -EPERM;

		} else if (val != sk->sk_mark) {

		else

			sk->sk_mark = val;

			sk_dst_reset(sk);

		}

		break;



	case SO_RXQ_OVFL: