kernel: CVE-2015-5364, CVE-2015-5366

This fixes incorrect processing of checksums in UDP implementation

Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>

2 files changed, 66 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-hierofalcon-3.19/udp_fix_behavior_of_wrong_checksums.patch b/recipes-kernel/linux/linux-hierofalcon-3.19/udp_fix_behavior_of_wrong_checksums.patch
new file mode 100644
index 0000000..f4a99ae
--- /dev/null
+++ b/recipes-kernel/linux/linux-hierofalcon-3.19/udp_fix_behavior_of_wrong_checksums.patch
@@ -0,0 +1,65 @@
+From beb39db59d14990e401e235faf66a6b9b31240b0 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Sat, 30 May 2015 09:16:53 -0700
+Subject: udp: fix behavior of wrong checksums
+
+[ Upstream commit beb39db59d14990e401e235faf66a6b9b31240b0 ]
+
+We have two problems in UDP stack related to bogus checksums :
+
+1) We return -EAGAIN to application even if receive queue is not empty.
+   This breaks applications using edge trigger epoll()
+
+2) Under UDP flood, we can loop forever without yielding to other
+   processes, potentially hanging the host, especially on non SMP.
+
+This patch is an attempt to make things better.
+
+We might in the future add extra support for rt applications
+wanting to better control time spent doing a recv() in a hostile
+environment. For example we could validate checksums before queuing
+packets in socket receive queue.
+
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: Willem de Bruijn <willemb@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Tudor Florea  <tudor.florea@enea.com>
+Upstream-Status: backport 
+
+diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
+index d10b7e0..1c92ea6 100644
+--- a/net/ipv4/udp.c
++++ b/net/ipv4/udp.c
+@@ -1295,10 +1295,8 @@ csum_copy_err:
+        }
+        unlock_sock_fast(sk, slow);
+ 
+-       if (noblock)
+-               return -EAGAIN;
+-
+-       /* starting over for a new packet */
++       /* starting over for a new packet, but check if we need to yield */
++       cond_resched();
+        msg->msg_flags &= ~MSG_TRUNC;
+        goto try_again;
+ }
+diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
+index c2ec416..e51fc3e 100644
+--- a/net/ipv6/udp.c
++++ b/net/ipv6/udp.c
+@@ -497,10 +497,8 @@ csum_copy_err:
+        }
+        unlock_sock_fast(sk, slow);
+ 
+-       if (noblock)
+-               return -EAGAIN;
+-
+-       /* starting over for a new packet */
++       /* starting over for a new packet, but check if we need to yield */
++       cond_resched();
+        msg->msg_flags &= ~MSG_TRUNC;
+        goto try_again;
+ }
+-- 
+cgit v0.10.2
+
diff --git a/recipes-kernel/linux/linux-hierofalcon_3.19.bb b/recipes-kernel/linux/linux-hierofalcon_3.19.bb
index 1a85f72..731c545 100644
--- a/recipes-kernel/linux/linux-hierofalcon_3.19.bb
+++ b/recipes-kernel/linux/linux-hierofalcon_3.19.bb
@@ -16,6 +16,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19;branch="standard/qemuarm6
            file://319-Hierofalcon-Update-xgbe-drivers-for-B0-board.patch \
            file://defconfig \
            file://keys-CVE-2015-1333.patch \
+           file://udp_fix_behavior_of_wrong_checksums.patch \
            "
 
 S = "${WORKDIR}/git"