From 835d9d4bc063ce23bb0cb9aeef74d1dc2659642c Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Mon, 27 Feb 2017 02:03:50 +0000 Subject: [PATCH] Linux 4.9.13 contains the CVE-2017-6074.patch, removing Signed-off-by: Sven Dowideit --- patches/CVE-2017-6074.patch | 47 ------------------------------------- scripts/extract | 10 ++++---- 2 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 patches/CVE-2017-6074.patch diff --git a/patches/CVE-2017-6074.patch b/patches/CVE-2017-6074.patch deleted file mode 100644 index 433fd4b..0000000 --- a/patches/CVE-2017-6074.patch +++ /dev/null @@ -1,47 +0,0 @@ -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/extract b/scripts/extract index a5b118e..6eb217a 100755 --- a/scripts/extract +++ b/scripts/extract @@ -24,9 +24,11 @@ fi cp ${CONFIG}/kernel-config ${DIR}/.config -pushd . -cd ${DIR} -patch -p1 < ${PATCHES}/* -popd +if [ -e "${PATCHES}" ]; then + pushd . + cd ${DIR} + patch -p1 < ${PATCHES}/* + popd +fi tar zcvf ${DIST}/kernel/linux-${KERNEL_VERSION}-src.tgz ${DIR}