summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJeremy Cline <jeremy@jcline.org>2017-10-11 16:11:48 -0400
committerJeremy Cline <jeremy@jcline.org>2017-10-11 16:18:08 -0400
commit7b8fc1877f1dee1ffd077ea7b2db2c1111addae7 (patch)
tree79edd250eb41dd26c70d0e44bc1156d68b9ba8d2 /kernel.spec
parent7271c4eb64c57cf2df5f387273716636176679e3 (diff)
downloadkernel-7b8fc1877f1dee1ffd077ea7b2db2c1111addae7.tar.gz
kernel-7b8fc1877f1dee1ffd077ea7b2db2c1111addae7.tar.xz
kernel-7b8fc1877f1dee1ffd077ea7b2db2c1111addae7.zip
Fix incorrect updates of uninstantiated keys crash the kernel (rhbz 1498017)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 2c98eb8ea..a5e79e121 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -636,6 +636,10 @@ Patch332: arm64-socionext-96b-enablement.patch
# CVE-2017-7477 rhbz 1445207 1445208
Patch502: CVE-2017-7477.patch
+# rhbz 1498016 1498017
+Patch503: KEYS-don-t-let-add_key-update-an-uninstantiated-key.patch
+Patch504: KEYS-fix-race-between-updating-and-finding-negative-.patch
+
# 600 - Patches for improved Bay and Cherry Trail device support
# Below patches are submitted upstream, awaiting review / merging
Patch601: 0001-Input-gpio_keys-Allow-suppression-of-input-events-fo.patch
@@ -2202,6 +2206,9 @@ fi
#
#
%changelog
+* Wed Oct 11 2017 Jeremy Cline <jeremy@jcline.org>
+- Fix incorrect updates of uninstantiated keys crash the kernel (rhbz 1498017)
+
* Wed Oct 11 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc4.git2.1
- Linux v4.14-rc4-77-g56ae414e9d27