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

This is the 4.4.205 stable release

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl3g1yIACgkQONu9yGCS
 aT6D6Q//eKAMw3qrydGPmHg5v4DV1SHGIQG0LGbq77vcYJWR426k7X1NaoGctdoz
 Va5NwMkMBZkc93Waat2t3U1Xr5wEx9hnlrPINsIrLHgHVMHvlAF3wSqniJDleYXG
 A0AwS5gHWmnV9UPC3t5R/GrwIXm8JmPIx5NdsdHqq34m0TVyxK/cC5vpJ9sU20l/
 ZVMRx4V1r22ZHmpTUE7gI2uWiLDBKBIJEkHwUbeqW0MmMEzErPY/umHlHdwrD8/+
 8GSAaN2bK8z5ss0eOnMaxYiaRobw+ywTj0P5cZbmUiTw8AvM/wSox7GdJ8QeSVwM
 HJRvHv2n8+l5XWS6VmJ9TmnIBhwtT5h5MTFlyr6BU3JcLhZSVjsihHA4F1N3Kpkz
 lw31asg71bW0lwiP6DsVeNUtehRT/qLhA55JBJ35nS8SA3f+DhbQH1EDMMeYHQ6e
 44vEkG/+GLRymWwNVjSajcLlEPKbbP640Ey53oe94BXh/2i0fTrv2F9fFjjbNwff
 tjlMtI49LzwFIueMjzVwaAwNAuDMUPVbehP47hAEqNOcqlodfbEhjEgJM5UYstqu
 HtKPYtQ7/AvU6b+OFLpJBAXkNCV7KUtVeYRWW1HOgJc3wOwCyPVp34uXPIyqaPfR
 knza2Jv5sIQs//XDy2YSJj4vE3HTapGiUwxKYc6Jcg4o44xnSGg=
 =sb+g
 -----END PGP SIGNATURE-----

Merge 4.4.205 into android-4.4-p

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

Change-Id: Idf9798de380712271babf65554ecc4251ea744f0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2019-11-29 09:42:58 +01:00
commit 516978792f
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
PATCHLEVEL = 4
SUBLEVEL = 204
SUBLEVEL = 205
EXTRAVERSION =
NAME = Blurry Fish Butt

6
net/core/sock.c
View file

@ -951,12 +951,10 @@ set_rcvbuf:
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: