From cef2e0e35727e45776b11834801e1665daf09ab3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 29 Jan 2016 09:28:32 +0100 Subject: [PATCH] rpi-kernel: update to 4.1.16. --- ...ing-ref-leak-in-join_session_keyring.patch | 75 ------------------- srcpkgs/rpi-kernel/template | 8 +- 2 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 srcpkgs/rpi-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch diff --git a/srcpkgs/rpi-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch b/srcpkgs/rpi-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch deleted file mode 100644 index c4f6ca2b4c0..00000000000 --- a/srcpkgs/rpi-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/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 10786a0ea57..6322f424dee 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -1,18 +1,18 @@ # Template file for 'rpi-kernel' # -_githash="853eff4e9b369cdc20be7c538bc5a5291eeab31d" +_githash="db37370d01c4f46c010ce666ce318fb385ac5fe7" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=4.1.15 -revision=3 +version=4.1.16 +revision=1 wrksrc="linux-${_githash}" maintainer="Juan RP " homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=662f048916c109e53d47f7a1108a14a163790746f08004a85a9fc0035de98f0f +checksum=b3ac2b29849a8625c5950b29dfcd9f3b495b9f137ead65c6e0a0612d0822c535 _kernver="${version}_${revision}"