diff --git a/srcpkgs/kirkwood-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch b/srcpkgs/kirkwood-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch deleted file mode 100644 index c4f6ca2b4c0..00000000000 --- a/srcpkgs/kirkwood-kernel/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 -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 - #include - #include - #include - - 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 -Signed-off-by: David Howells ---- - 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/kirkwood-kernel/template b/srcpkgs/kirkwood-kernel/template index 3c44ff14abb..af640c5d687 100644 --- a/srcpkgs/kirkwood-kernel/template +++ b/srcpkgs/kirkwood-kernel/template @@ -1,7 +1,7 @@ # Template file for 'kirkwood-kernel' pkgname=kirkwood-kernel -version=4.1.15 -revision=2 +version=4.1.16 +revision=1 wrksrc="linux-${version}" maintainer="Andrea Brancaleoni " homepage="http://www.kernel.org/" @@ -14,8 +14,8 @@ https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/${_commit}/core/linux-k https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/${_commit}/core/linux-kirkwood/config" skip_extraction="mach-types archlinuxarm.patch config" checksum=" -472288cc966188c5d7c511c6be0f78682843c9ca2d5d6c4d67d77455680359a3 -554a2907aa551af691230ba2ecb06dbc8223579991e52e822ec758131cd968f8 +8792030cceeb9e6b9e4896afb44d59854ac9d5354ce0ea847ad301f5aa9eb26e +dc7542c8ccc2ce578614a6b98f55b300a35705abb0785511de65e5709cc581e0 53259fb05cb3903c5215da33426a654e3f212756cce155363decf8dc5ed7751e 1a6825cf6467604138e25c806cd9ff5b964894dbafc1f6a97fe8386c45f644bd"