commit 21c2764272a0038b38aa61e2d2cd6dc98973546e
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Feb 23 13:50:08 2017 +0100
- rel 3; fixes CVE-2017-6074 (local root)
kernel-small_fixes.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
kernel.spec | 2 +-
2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index 412c4e0..37b5461 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
%define have_pcmcia 0
%endif
-%define rel 2
+%define rel 3
%define basever 4.1
%define postver .38
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 00e17ae..bdbca6d 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -169,3 +169,50 @@ index 4f56b10..5b48bed 100644
--
cgit v0.12
+From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001
+From: Andrey Konovalov <[email protected]>
+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 <[email protected]>
+Acked-by: Eric Dumazet <[email protected]>
+Signed-off-by: David S. Miller <[email protected]>
+---
+ 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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/21c2764272a0038b38aa61e2d2cd6dc98973546e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
