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

Commit f82a2dba authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.205(a36b5017) into msm-4.9 



* refs/heads/tmp-a36b5017:
  Linux 4.9.205
  Revert "sock: Reset dst when changing sk_mark via setsockopt"

Change-Id: I9f528492407d75abd5586f8ee57984a15c05fb43
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents d3054dc3 a36b5017

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: