mirror of
https://github.com/rancher/os-kernel.git
synced 2025-09-01 12:56:25 +00:00
Add support for patched kernels and publish the source that was built
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86 4.9.8 Kernel Configuration
|
# Linux/x86 4.9.12 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
CONFIG_X86_64=y
|
CONFIG_X86_64=y
|
||||||
|
47
patches/CVE-2017-6074.patch
Normal file
47
patches/CVE-2017-6074.patch
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrey Konovalov <andreyknvl@google.com>
|
||||||
|
Date: Thu, 16 Feb 2017 17:22:46 +0100
|
||||||
|
Subject: dccp: fix freeing skb too early for IPV6_RECVPKTINFO
|
||||||
|
|
||||||
|
In the current DCCP implementation an skb for a DCCP_PKT_REQUEST packet
|
||||||
|
is forcibly freed via __kfree_skb in dccp_rcv_state_process if
|
||||||
|
dccp_v6_conn_request successfully returns.
|
||||||
|
|
||||||
|
However, if IPV6_RECVPKTINFO is set on a socket, the address of the skb
|
||||||
|
is saved to ireq->pktopts and the ref count for skb is incremented in
|
||||||
|
dccp_v6_conn_request, so skb is still in use. Nevertheless, it gets freed
|
||||||
|
in dccp_rcv_state_process.
|
||||||
|
|
||||||
|
Fix by calling consume_skb instead of doing goto discard and therefore
|
||||||
|
calling __kfree_skb.
|
||||||
|
|
||||||
|
Similar fixes for TCP:
|
||||||
|
|
||||||
|
fb7e2399ec17f1004c0e0ccfd17439f8759ede01 [TCP]: skb is unexpectedly freed.
|
||||||
|
0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now
|
||||||
|
simply consumed
|
||||||
|
|
||||||
|
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
|
||||||
|
Acked-by: Eric Dumazet <edumazet@google.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
---
|
||||||
|
net/dccp/input.c | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/net/dccp/input.c b/net/dccp/input.c
|
||||||
|
index ba34718..8fedc2d 100644
|
||||||
|
--- a/net/dccp/input.c
|
||||||
|
+++ b/net/dccp/input.c
|
||||||
|
@@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
|
||||||
|
if (inet_csk(sk)->icsk_af_ops->conn_request(sk,
|
||||||
|
skb) < 0)
|
||||||
|
return 1;
|
||||||
|
- goto discard;
|
||||||
|
+ consume_skb(skb);
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
if (dh->dccph_type == DCCP_PKT_RESET)
|
||||||
|
goto discard;
|
||||||
|
--
|
||||||
|
cgit v0.12
|
||||||
|
|
@@ -11,6 +11,10 @@ fi
|
|||||||
: ${BUILD:=/usr/src}
|
: ${BUILD:=/usr/src}
|
||||||
: ${CONFIG:=$(pwd)/config}
|
: ${CONFIG:=$(pwd)/config}
|
||||||
: ${DIST:=$(pwd)/dist}
|
: ${DIST:=$(pwd)/dist}
|
||||||
|
: ${PATCHES:=$(pwd)/patches}
|
||||||
|
|
||||||
|
mkdir -p ${DIST}/kernel
|
||||||
|
|
||||||
|
|
||||||
list_build_files() {
|
list_build_files() {
|
||||||
find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl
|
find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl
|
||||||
|
@@ -23,3 +23,9 @@ if [ ! -e ${DIR} ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cp ${CONFIG}/kernel-config ${DIR}/.config
|
cp ${CONFIG}/kernel-config ${DIR}/.config
|
||||||
|
|
||||||
|
pushd .
|
||||||
|
cd ${DIR}
|
||||||
|
patch -p1 < ${PATCHES}/*
|
||||||
|
popd
|
||||||
|
|
||||||
|
@@ -42,8 +42,6 @@ else
|
|||||||
|
|
||||||
create_firmware_tar $FIRMWARE
|
create_firmware_tar $FIRMWARE
|
||||||
|
|
||||||
mkdir -p ${DIST}/kernel
|
|
||||||
|
|
||||||
FILE="linux-${KVER}-x86.tar"
|
FILE="linux-${KVER}-x86.tar"
|
||||||
|
|
||||||
(
|
(
|
||||||
|
@@ -7,6 +7,7 @@ mv build.log dist/
|
|||||||
|
|
||||||
echo
|
echo
|
||||||
echo "--- ${KERNEL_VERSION} Kernel prepared for RancherOS"
|
echo "--- ${KERNEL_VERSION} Kernel prepared for RancherOS"
|
||||||
|
echo " ./dist/kernel/linux-${KERNEL_VERSION}-src.tgz"
|
||||||
echo " ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz"
|
echo " ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz"
|
||||||
echo " ./dist/kernel/build-linux-${KERNEL_VERSION}-x86.tar.gz"
|
echo " ./dist/kernel/build-linux-${KERNEL_VERSION}-x86.tar.gz"
|
||||||
echo " ./dist/kernel/linux-${KERNEL_VERSION}-x86.tar.gz"
|
echo " ./dist/kernel/linux-${KERNEL_VERSION}-x86.tar.gz"
|
||||||
@@ -20,6 +21,7 @@ echo "to publish kernel files and container images, run dist/publish.sh"
|
|||||||
|
|
||||||
echo "#!/bin/sh"> dist/publish.sh
|
echo "#!/bin/sh"> dist/publish.sh
|
||||||
echo "github-release release --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --pre-release" >> dist/publish.sh
|
echo "github-release release --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --pre-release" >> dist/publish.sh
|
||||||
|
echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/linux-${KERNEL_VERSION}-src.tgz --name linux-${KERNEL_VERSION}-src.tgz" >> dist/publish.sh
|
||||||
echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/build-linux-${KERNEL_VERSION}-x86.tar.gz --name build-linux-${KERNEL_VERSION}-x86.tar.gz" >> dist/publish.sh
|
echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/build-linux-${KERNEL_VERSION}-x86.tar.gz --name build-linux-${KERNEL_VERSION}-x86.tar.gz" >> dist/publish.sh
|
||||||
echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/config --name config" >> dist/publish.sh
|
echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/config --name config" >> dist/publish.sh
|
||||||
echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz --name extra-linux-${KERNEL_VERSION}-x86.tar.gz" >> dist/publish.sh
|
echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz --name extra-linux-${KERNEL_VERSION}-x86.tar.gz" >> dist/publish.sh
|
||||||
|
Reference in New Issue
Block a user