diff --git a/core/linux-odroid-c1/0001-gcc-5.1-fix-for-mac-address.patch b/core/linux-odroid-c1/0001-gcc-5.1-fix-for-mac-address.patch index 91df41472..516b4d82d 100644 --- a/core/linux-odroid-c1/0001-gcc-5.1-fix-for-mac-address.patch +++ b/core/linux-odroid-c1/0001-gcc-5.1-fix-for-mac-address.patch @@ -1,7 +1,7 @@ -From a4a1d285e508db9cc72d213be528a3d74d7573d8 Mon Sep 17 00:00:00 2001 +From 9f8c694381ac8c9afabde2e7a2fe4d9b0450dc65 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 23 Jun 2015 18:02:40 -0600 -Subject: [PATCH] gcc 5.1 fix for mac address +Subject: [PATCH 1/2] gcc 5.1 fix for mac address Signed-off-by: Kevin Mihelich --- @@ -106,5 +106,5 @@ index c39df30..a192128 100644 memcpy(DEFMAC, mac, 6); g_mac_addr_setup++; -- -2.4.4 +2.7.0 diff --git a/core/linux-odroid-c1/kernel-CVE-2016-0728.patch b/core/linux-odroid-c1/0002-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch similarity index 89% rename from core/linux-odroid-c1/kernel-CVE-2016-0728.patch rename to core/linux-odroid-c1/0002-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch index 49020d7db..00cb36843 100644 --- a/core/linux-odroid-c1/kernel-CVE-2016-0728.patch +++ b/core/linux-odroid-c1/0002-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch @@ -1,7 +1,7 @@ -From 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 Mon Sep 17 00:00:00 2001 +From 3c717585eb00c0efca07a1a7f29a833db4726e93 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() +Subject: [PATCH 2/2] KEYS: Fix keyring ref leak in join_session_keyring() This fixes CVE-2016-0728. @@ -65,10 +65,10 @@ Signed-off-by: James Morris 1 file changed, 1 insertion(+) diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c -index a3f85d2..e6d50172 100644 +index 42defae..cd871dc 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c -@@ -794,6 +794,7 @@ long join_session_keyring(const char *name) +@@ -792,6 +792,7 @@ long join_session_keyring(const char *name) ret = PTR_ERR(keyring); goto error2; } else if (keyring == new->session_keyring) { @@ -77,5 +77,5 @@ index a3f85d2..e6d50172 100644 goto error2; } -- -cgit v0.12 +2.7.0 diff --git a/core/linux-odroid-c1/PKGBUILD b/core/linux-odroid-c1/PKGBUILD index bb8a1bf08..d10c0d762 100644 --- a/core/linux-odroid-c1/PKGBUILD +++ b/core/linux-odroid-c1/PKGBUILD @@ -4,12 +4,12 @@ buildarch=4 pkgbase=linux-odroid-c1 -_commit=98b7d2c2c9da3d43d42adce240edef98c3c50a43 +_commit=a1642400d64ea68b9e10cb8683cc6c5c93e540b5 _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="ODROID-C1" pkgver=3.10.80 -pkgrel=19 +pkgrel=20 arch=('armv7h') url="https://github.com/hardkernel/linux" license=('GPL2') @@ -18,13 +18,13 @@ options=('!strip') source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz" "git+https://github.com/mdrjr/c1_bootini.git" '0001-gcc-5.1-fix-for-mac-address.patch' - 'kernel-CVE-2016-0728.patch' + '0002-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch' 'config' 'amlogic.service') -md5sums=('97dff8b88cb15780aaba7c794f52c623' +md5sums=('7c5aa56cbbc8c944b00e7ff430caab55' 'SKIP' - '31b78a5c8c50bae59d62b11f53e14642' - '6470e9783bd1c7a8feddc2d67f07afd5' + 'cc526d3d7ec020f42fd47401f3af0eac' + 'ff03cd607742634a7c8e90dc521cb60b' '3a0bf97c1c2f680328b49746e463c271' 'b8956789318f49cec5b8bb0b41654a9b') @@ -32,7 +32,7 @@ prepare() { cd "${srcdir}/${_srcname}" git apply ../0001-gcc-5.1-fix-for-mac-address.patch - git apply ../kernel-CVE-2016-0728.patch + git apply ../0002-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch cat "${srcdir}/config" > ./.config