From 252fcd6cd83134cfe7f77cfdc436e5e2626afe71 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 26 Jan 2016 00:03:02 +0100 Subject: [PATCH] - 3.18.26 --- kernel-small_fixes.patch | 75 ---------------------------------------- kernel.spec | 6 ++-- 2 files changed, 3 insertions(+), 78 deletions(-) diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index fa91e5d0..fb7f26f7 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -96,78 +96,3 @@ index 28011fb1..c6ded6b 100644 .pkts_acked = bictcp_acked, .owner = THIS_MODULE, .name = "cubic", -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 a/security/keys/process_keys.c b/security/keys/process_keys.c -index a3f85d2..e6d50172 100644 ---- a/security/keys/process_keys.c -+++ b/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/kernel.spec b/kernel.spec index 951fac30..d5ccec6e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -70,9 +70,9 @@ %define have_pcmcia 0 %endif -%define rel 2 +%define rel 1 %define basever 3.18 -%define postver .25 +%define postver .26 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -121,7 +121,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 9e854df51ca3fef8bfe566dbd7b89241 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz -# Patch0-md5: f6ef3c221de603e397afc32c24f714ce +# Patch0-md5: 9999ed984f4bde5307dcd024804bfc87 %endif Source1: kernel.sysconfig -- 2.44.0