Annotation of /trunk/kernel-alx/patches-4.9/0304-4.9.205-all-fixes.patch
Parent Directory | Revision Log
Revision 3579 -
(hide annotations)
(download)
Thu Aug 13 10:21:20 2020 UTC (4 years, 1 month ago) by niro
File size: 717 byte(s)
Thu Aug 13 10:21:20 2020 UTC (4 years, 1 month ago) by niro
File size: 717 byte(s)
linux-205
1 | niro | 3579 | diff --git a/Makefile b/Makefile |
2 | index 0234869784fa..fc1a58ef7e56 100644 | ||
3 | --- a/Makefile | ||
4 | +++ b/Makefile | ||
5 | @@ -1,6 +1,6 @@ | ||
6 | VERSION = 4 | ||
7 | PATCHLEVEL = 9 | ||
8 | -SUBLEVEL = 204 | ||
9 | +SUBLEVEL = 205 | ||
10 | EXTRAVERSION = | ||
11 | NAME = Roaring Lionus | ||
12 | |||
13 | diff --git a/net/core/sock.c b/net/core/sock.c | ||
14 | index 9178c1654375..d22493351407 100644 | ||
15 | --- a/net/core/sock.c | ||
16 | +++ b/net/core/sock.c | ||
17 | @@ -945,12 +945,10 @@ set_rcvbuf: | ||
18 | clear_bit(SOCK_PASSSEC, &sock->flags); | ||
19 | break; | ||
20 | case SO_MARK: | ||
21 | - if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) { | ||
22 | + if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) | ||
23 | ret = -EPERM; | ||
24 | - } else if (val != sk->sk_mark) { | ||
25 | + else | ||
26 | sk->sk_mark = val; | ||
27 | - sk_dst_reset(sk); | ||
28 | - } | ||
29 | break; | ||
30 | |||
31 | case SO_RXQ_OVFL: |