evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Merge android-4.4-p.205 (5169787) into msm-4.4"

Browse source
This commit is contained in:
Linux Build Service Account 2019-12-04 05:36:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit 7207889184
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
VERSION = 4 VERSION = 4
PATCHLEVEL = 4 PATCHLEVEL = 4
SUBLEVEL = 204 SUBLEVEL = 205
EXTRAVERSION = EXTRAVERSION =
NAME = Blurry Fish Butt NAME = Blurry Fish Butt

6
net/core/sock.c
View file

@ -951,12 +951,10 @@ set_rcvbuf:
clear_bit(SOCK_PASSSEC, &sock->flags); clear_bit(SOCK_PASSSEC, &sock->flags);
break; break;
case SO_MARK: 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; ret = -EPERM;
} else if (val != sk->sk_mark) { else
sk->sk_mark = val; sk->sk_mark = val;
sk_dst_reset(sk);
}
break; break;
case SO_RXQ_OVFL: case SO_RXQ_OVFL: