diff --git a/core/linux-oxnas/PKGBUILD b/core/linux-oxnas/PKGBUILD index fee2e4a58..aa359488a 100644 --- a/core/linux-oxnas/PKGBUILD +++ b/core/linux-oxnas/PKGBUILD @@ -9,20 +9,25 @@ _srcname=linux-oxnas-${_commit} _kernelname=${pkgbase#linux} _desc="PLX/Oxford Semiconductor NAS7820" pkgver=3.12.6 -pkgrel=1 +pkgrel=2 arch=('arm') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git') options=('!strip') source=("https://github.com/kref/linux-oxnas/archive/${_commit}.tar.gz" + 'kernel-CVE-2016-0728.patch' 'config') md5sums=('5865edf2e82fba018b102486ea94cad5' + '6470e9783bd1c7a8feddc2d67f07afd5' '471f0c6341028fc093ef22c545b77ab8') prepare() { cd "${srcdir}/${_srcname}" + # CVE-2016-0728 + git apply ../kernel-CVE-2016-0728.patch + cat "${srcdir}/config" > ./.config # add pkgrel to extraversion diff --git a/core/linux-oxnas/kernel-CVE-2016-0728.patch b/core/linux-oxnas/kernel-CVE-2016-0728.patch new file mode 100644 index 000000000..49020d7db --- /dev/null +++ b/core/linux-oxnas/kernel-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 +