From 8c2840b1740b9af31f50213fbe15a9d8a440e6b9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Thu, 3 Mar 2016 10:25:28 +0100
Subject: [PATCH] linux3.14: update to 3.14.62.

---
 ...ing-ref-leak-in-join_session_keyring.patch | 75 -------------------
 srcpkgs/linux3.14/template                    |  7 +-
 2 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/linux3.14/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch

diff --git a/srcpkgs/linux3.14/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch b/srcpkgs/linux3.14/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
deleted file mode 100644
index c4f6ca2b4c..0000000000
--- a/srcpkgs/linux3.14/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7ca88764d45c209791e8813131c1457c2e9e51e7 Mon Sep 17 00:00:00 2001
-From: Yevgeny Pats <yevgeny@perception-point.io>
-Date: Mon, 11 Jan 2016 12:05:28 +0000
-Subject: KEYS: Fix keyring ref leak in join_session_keyring()
-
-If a thread is asked to join as a session keyring the keyring that's already
-set as its session, we leak a keyring reference.
-
-This can be tested with the following program:
-
-	#include <stddef.h>
-	#include <stdio.h>
-	#include <sys/types.h>
-	#include <keyutils.h>
-
-	int main(int argc, const char *argv[])
-	{
-		int i = 0;
-		key_serial_t serial;
-
-		serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
-				"leaked-keyring");
-		if (serial < 0) {
-			perror("keyctl");
-			return -1;
-		}
-
-		if (keyctl(KEYCTL_SETPERM, serial,
-			   KEY_POS_ALL | KEY_USR_ALL) < 0) {
-			perror("keyctl");
-			return -1;
-		}
-
-		for (i = 0; i < 100; i++) {
-			serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
-					"leaked-keyring");
-			if (serial < 0) {
-				perror("keyctl");
-				return -1;
-			}
-		}
-
-		return 0;
-	}
-
-If, after the program has run, there something like the following line in
-/proc/keys:
-
-3f3d898f I--Q---   100 perm 3f3f0000     0     0 keyring   leaked-keyring: empty
-
-with a usage count of 100 * the number of times the program has been run,
-then the kernel is malfunctioning.  If leaked-keyring has zero usages or
-has been garbage collected, then the problem is fixed.
-
-Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- security/keys/process_keys.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git security/keys/process_keys.c security/keys/process_keys.c
-index a3f85d2..e6d50172 100644
---- security/keys/process_keys.c
-+++ security/keys/process_keys.c
-@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
- 		ret = PTR_ERR(keyring);
- 		goto error2;
- 	} else if (keyring == new->session_keyring) {
-+		key_put(keyring);
- 		ret = 0;
- 		goto error2;
- 	}
--- 
-2.7.0.rc3
-
diff --git a/srcpkgs/linux3.14/template b/srcpkgs/linux3.14/template
index 583742575e..8437f5246b 100644
--- a/srcpkgs/linux3.14/template
+++ b/srcpkgs/linux3.14/template
@@ -1,16 +1,15 @@
 # Template file for 'linux3.14'
 #
 pkgname=linux3.14
-reverts=3.14.61_1
-version=3.14.58
-revision=2
+version=3.14.62
+revision=1
 wrksrc="linux-${version}"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.kernel.org"
 license="GPL-2"
 short_desc="The Linux kernel and modules (3.14 series)"
 distfiles="${KERNEL_SITE}/kernel/v3.x/linux-${version}.tar.xz"
-checksum=f4d016cb807b294988c6515c245939b2a7987ba606ad0662958bd8cb8600814b
+checksum=d5b7599bd8fd5013d19219a25c25e3525f2110901966461dda07b45caab2ec46
 
 _kernver="${version}_${revision}"