summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-17 15:13:19 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-17 15:15:29 -0400
commit4d441daa479301c89a5c34a41fea2e4aa2bbbb4b (patch)
tree50129fc3c52baecb7b7ffbb080e9348aaa79de64 /kernel.spec
parent6a06c8fd768fe7ff6f078fafb57014073cf17d6f (diff)
downloadkernel-4d441daa479301c89a5c34a41fea2e4aa2bbbb4b.tar.gz
kernel-4d441daa479301c89a5c34a41fea2e4aa2bbbb4b.tar.xz
kernel-4d441daa479301c89a5c34a41fea2e4aa2bbbb4b.zip
CVE-2014-8086 ext4: race condition (rhbz 1151353 1152608)
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 460714ba8..a194cb254 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 3
+%global baserelease 4
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -611,6 +611,9 @@ Patch26039: HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-01.patch
Patch26040: Revert-Btrfs-race-free-update-of-commit-root-for-ro-.patch
+#CVE-2014-8086 rhbz 1151353 1152608
+Patch26056: ext4-fix-race-between-write-and-fcntl-F_SETFL.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1334,6 +1337,9 @@ ApplyPatch HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-01.patch
ApplyPatch Revert-Btrfs-race-free-update-of-commit-root-for-ro-.patch
+#CVE-2014-8086 rhbz 1151353 1152608
+ApplyPatch ext4-fix-race-between-write-and-fcntl-F_SETFL.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2203,6 +2209,7 @@ fi
# || ||
%changelog
* Fri Oct 17 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2014-8086 ext4: race condition (rhbz 1151353 1152608)
- Enable B43_PHY_G to fix b43 driver regression (rhbz 1152502)
* Wed Oct 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git9.3