- 4.9.302

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index b5a1725a6526ca48e41eb844c9b30d920ef6e98a..62a32134bf6d78c85f35f98f3720ce1cb44347bb 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -9359,6 +9359,7 @@ TIMERFD all=y
 EVENTFD all=y
 BPF_SYSCALL all=y
 BPF_JIT_ALWAYS_ON all=y
+BPF_UNPRIV_DEFAULT_OFF all=y
 SHMEM all=y
 AIO all=y
 USERFAULTFD all=y

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 559a6938ab6a6b381795f169550fdd7e94ae2a44..f24eee7164e5b8419d4fe471bce02aab8fb15d44 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -23700,7 +23700,7 @@ diff -urNp -x '*.orig' linux-4.9/net/ipv4/raw.c linux-4.9/net/ipv4/raw.c
        security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
        rt = ip_route_output_flow(net, &fl4, sk);
        if (IS_ERR(rt)) {
-@@ -703,17 +719,19 @@ static int raw_bind(struct sock *sk, str
+@@ -703,18 +719,20 @@ static int raw_bind(struct sock *sk, str
  {
        struct inet_sock *inet = inet_sk(sk);
        struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
@@ -23708,6 +23708,7 @@ diff -urNp -x '*.orig' linux-4.9/net/ipv4/raw.c linux-4.9/net/ipv4/raw.c
        int ret = -EINVAL;
        int chk_addr_ret;
  
+       lock_sock(sk);
        if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
                goto out;
 -      chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);

diff --git a/kernel.spec b/kernel.spec
index 9e8c050dea34ee61759387a581f36978d7281f5c..1364c72463369760337af752187d7df85ac3ea8a 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
 
 %define                rel             1
 %define                basever         4.9
-%define                postver         .299
+%define                postver         .302
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -125,7 +125,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 0a68ef3615c64bd5ee54a3320e46667d
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  bcb6bf56e94dc38866865fdd610895a4
+# Patch0-md5:  167dbca71dc364d3cac2e552fac4cb44
 %endif
 Source1:       kernel.sysconfig