diff --git a/config/kernel-config b/config/kernel-config index aefd6cc..62dfdfa 100644 --- a/config/kernel-config +++ b/config/kernel-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.8 Kernel Configuration +# Linux/x86 4.9.12 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/patches/CVE-2017-6074.patch b/patches/CVE-2017-6074.patch new file mode 100644 index 0000000..433fd4b --- /dev/null +++ b/patches/CVE-2017-6074.patch @@ -0,0 +1,47 @@ +From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001 +From: Andrey Konovalov +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 +Acked-by: Eric Dumazet +Signed-off-by: David S. Miller +--- + 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 + diff --git a/scripts/build-common b/scripts/build-common index d28591b..e214d14 100644 --- a/scripts/build-common +++ b/scripts/build-common @@ -11,6 +11,10 @@ fi : ${BUILD:=/usr/src} : ${CONFIG:=$(pwd)/config} : ${DIST:=$(pwd)/dist} +: ${PATCHES:=$(pwd)/patches} + +mkdir -p ${DIST}/kernel + list_build_files() { find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl diff --git a/scripts/extract b/scripts/extract index bf14eb5..0a003a0 100755 --- a/scripts/extract +++ b/scripts/extract @@ -23,3 +23,9 @@ if [ ! -e ${DIR} ]; then fi cp ${CONFIG}/kernel-config ${DIR}/.config + +pushd . +cd ${DIR} +patch -p1 < ${PATCHES}/* +popd + diff --git a/scripts/package-kernel b/scripts/package-kernel index 2e5b9f7..e898572 100755 --- a/scripts/package-kernel +++ b/scripts/package-kernel @@ -42,8 +42,6 @@ else create_firmware_tar $FIRMWARE - mkdir -p ${DIST}/kernel - FILE="linux-${KVER}-x86.tar" ( diff --git a/scripts/release b/scripts/release index 5b8aa58..33dfbb9 100755 --- a/scripts/release +++ b/scripts/release @@ -7,6 +7,7 @@ mv build.log dist/ echo 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/build-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 "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/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