bump 3.7.10

6 files changed, 12 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8892455e1a35..e68b1a735484 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-linode
 	pkgdesc = Kernel for Arch Linux on Linode
-	pkgver = 3.7.9
+	pkgver = 3.7.10
 	pkgrel = 1
 	url = https://github.com/yardenac/linux-linode
 	install = linux-linode.install
@@ -25,20 +25,18 @@ pkgbase = linux-linode
 	backup = etc/mkinitcpio.d/linux-linode.preset
 	backup = boot/grub/menu.lst
 	source = http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.7.tar.xz
-	source = http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.7.9.xz
+	source = http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.7.10.xz
 	source = config
 	source = config.x86_64
 	source = menu.lst
 	source = linux-linode.preset
-	source = CVE-2013-1763.patch
 	source = change-default-console-loglevel.patch
 	md5sums = 21223369d682bcf44bcdfe1521095983
-	md5sums = 375fa67b3daba9e6040f13a0a29bf543
-	md5sums = 27254c8495fcded64b4cbf6be80e7d2b
-	md5sums = 2e9d92b6963061202fbd0c661ae022f1
+	md5sums = ffc885cf2fdedf1792b999d4ab5b8ba8
+	md5sums = 8d3616e6ada3119a0466ae08ada7aaae
+	md5sums = 6a22c97bddb2af735013c16c87595c46
 	md5sums = d01f2350ec9f92e2eabcde0f11be24f2
 	md5sums = ee66f3cd0c5bc0ba0f65499784d19f30
-	md5sums = 47e4472ae060798baae01662d661a87b
 	md5sums = 9d3c56a4b999c8bfbd4018089a62f662
 
 pkgname = linux-linode
diff --git a/CVE-2013-1763.patch b/CVE-2013-1763.patch
deleted file mode 100644
index a4f0d2ee0a12..000000000000
--- a/CVE-2013-1763.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001
-From: Mathias Krause <minipli@googlemail.com>
-Date: Sat, 23 Feb 2013 01:13:47 +0000
-Subject: [PATCH] sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
-
-Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY
-with a family greater or equal then AF_MAX -- the array size of
-sock_diag_handlers[]. The current code does not test for this
-condition therefore is vulnerable to an out-of-bound access opening
-doors for a privilege escalation.
-
-Signed-off-by: Mathias Krause <minipli@googlemail.com>
-Acked-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/core/sock_diag.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
-index 602cd63..750f44f 100644
---- a/net/core/sock_diag.c
-+++ b/net/core/sock_diag.c
-@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
-	if (nlmsg_len(nlh) < sizeof(*req))
-		return -EINVAL;
-
-+	if (req->sdiag_family >= AF_MAX)
-+		return -EINVAL;
-+
-	hndl = sock_diag_lock_handler(req->sdiag_family);
-	if (hndl == NULL)
-		err = -ENOENT;
---
-1.7.6.5
diff --git a/PKGBUILD b/PKGBUILD
index d9f83b008070..e4de1b3ab2cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=linux-linode
 _basekernel=3.7
 _kernelname=${pkgname#linux}
 _srcname=linux-${_basekernel}
-pkgver=${_basekernel}.9
+pkgver=${_basekernel}.10
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://github.com/yardenac/linux-linode"
@@ -15,15 +15,13 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         'config.x86_64'
         'menu.lst'
         "${pkgname}.preset"
-        "CVE-2013-1763.patch"
         'change-default-console-loglevel.patch')
 md5sums=('21223369d682bcf44bcdfe1521095983'
-         '375fa67b3daba9e6040f13a0a29bf543'
-         '27254c8495fcded64b4cbf6be80e7d2b'
-         '2e9d92b6963061202fbd0c661ae022f1'
+         'ffc885cf2fdedf1792b999d4ab5b8ba8'
+         '8d3616e6ada3119a0466ae08ada7aaae'
+         '6a22c97bddb2af735013c16c87595c46'
          'd01f2350ec9f92e2eabcde0f11be24f2'
          'ee66f3cd0c5bc0ba0f65499784d19f30'
-         '47e4472ae060798baae01662d661a87b'
          '9d3c56a4b999c8bfbd4018089a62f662')
 pkgdesc="Kernel for Arch Linux on Linode"
 depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
@@ -36,7 +34,6 @@ install=${pkgname}.install
 build() {
   cd "${srcdir}/${_srcname}"
   patch -p1 -i "${srcdir}/patch-${pkgver}"
-  patch -p1 -i "${srcdir}/CVE-2013-1763.patch"
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
   if [ "${CARCH}" = "x86_64" ]; then
     cat "${srcdir}/config.x86_64" > ./.config
diff --git a/config b/config
index f1df9874e651..036f81ff8612 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.9-1 Kernel Configuration
+# Linux/i386 3.7.10-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/config.x86_64 b/config.x86_64
index 96b876b17bc0..82d396915521 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.9-1 Kernel Configuration
+# Linux/x86_64 3.7.10-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/linux-linode.install b/linux-linode.install
index ff2753201c9e..3389f751716f 100644
--- a/linux-linode.install
+++ b/linux-linode.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-linode
-KERNEL_VERSION=3.7.9-1-linode
+KERNEL_VERSION=3.7.10-1-linode
 
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'