From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C2CE958973 for ; Wed, 20 Jan 2016 14:35:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A2AE21C053; Wed, 20 Jan 2016 14:35:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D20ED21C053 for ; Wed, 20 Jan 2016 14:35:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 882FD340A51 for ; Wed, 20 Jan 2016 14:35:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0FE4C7A for ; Wed, 20 Jan 2016 14:35:16 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1453300520.5976cc60315452fcf49adda2f52e5ff8c966e831.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:3.18 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 1520_keyring-refleak-in-join-session-CVE-2016-0728.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 5976cc60315452fcf49adda2f52e5ff8c966e831 X-VCS-Branch: 3.18 Date: Wed, 20 Jan 2016 14:35:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fcd43391-ca98-4974-a09b-76009467531b X-Archives-Hash: 17d5cdc6cdbff47b135f7f8232c8e5ec commit: 5976cc60315452fcf49adda2f52e5ff8c966e831 Author: Mike Pagano gentoo org> AuthorDate: Wed Jan 20 14:35:20 2016 +0000 Commit: Mike Pagano gentoo org> CommitDate: Wed Jan 20 14:35:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=5976cc60 Ensure that thread joining a session keyring does not leak the keyring reference. CVE-2016-0728. 0000_README | 4 ++ ...ing-refleak-in-join-session-CVE-2016-0728.patch | 81 ++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/0000_README b/0000_README index 369ed3d..3fe5eec 100644 --- a/0000_README +++ b/0000_README @@ -151,6 +151,10 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ Desc: Enable link security restrictions by default +Patch: 1520_keyring-refleak-in-join-session-CVE-2016-0728.patch +From: https://bugs.gentoo.org/show_bug.cgi?id=572384 +Desc: Ensure that thread joining a session keyring does not leak the keyring reference. CVE-2016-0728. + Patch: 1700_ARM-dts-patch-to-support-popoplug-e02.patch From: https://bugs.gentoo.org/show_bug.cgi?id=508248 Desc: ARM: dts: Add support for Pogoplug E02. diff --git a/1520_keyring-refleak-in-join-session-CVE-2016-0728.patch b/1520_keyring-refleak-in-join-session-CVE-2016-0728.patch new file mode 100644 index 0000000..49020d7 --- /dev/null +++ b/1520_keyring-refleak-in-join-session-CVE-2016-0728.patch @@ -0,0 +1,81 @@ +From 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 Mon Sep 17 00:00:00 2001 +From: Yevgeny Pats +Date: Tue, 19 Jan 2016 22:09:04 +0000 +Subject: KEYS: Fix keyring ref leak in join_session_keyring() + +This fixes CVE-2016-0728. + +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 +Acked-by: Don Zickus +Acked-by: Prarit Bhargava +Acked-by: Jarod Wilson +Signed-off-by: James Morris +--- + 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; + } +-- +cgit v0.12 +