summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-08-03 09:30:37 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-08-03 09:52:51 -0400
commit4a8bd132d4f2792782623fb292455f56e3ae259e (patch)
treed9cf2c9d72af9234fae9ee053c8bd3aba8dc64cb /kernel.spec
parentd1027f01240c3426211a80146f8c36c2b5736865 (diff)
downloadkernel-4a8bd132d4f2792782623fb292455f56e3ae259e.tar.gz
kernel-4a8bd132d4f2792782623fb292455f56e3ae259e.tar.xz
kernel-4a8bd132d4f2792782623fb292455f56e3ae259e.zip
CVE-2012-3412 sfc: potential rDOS through TCP MSS option (rhbz 844714 845558)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index f52a9c88c..cbedb1e7b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,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
@@ -746,6 +746,11 @@ Patch22059: uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch
Patch22062: cfg80211-add-channel-flag-to-prohibit-OFDM-operation.patch
Patch22063: brcmsmac-use-channel-flags-to-restrict-OFDM.patch
+#rhbz 845558 844714
+Patch22070: net-Allow-driver-to-limit-number-of-GSO-segments-per-skb.patch
+Patch22071: sfc-Fix-maximum-number-of-TSO-segments-and-minimum-TX-queue-size.patch
+Patch22072: tcp-Apply-device-TSO-segment-limit-earlier.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1437,6 +1442,11 @@ ApplyPatch uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch
ApplyPatch cfg80211-add-channel-flag-to-prohibit-OFDM-operation.patch
ApplyPatch brcmsmac-use-channel-flags-to-restrict-OFDM.patch
+#rhbz 845558 844714
+ApplyPatch net-Allow-driver-to-limit-number-of-GSO-segments-per-skb.patch
+ApplyPatch sfc-Fix-maximum-number-of-TSO-segments-and-minimum-TX-queue-size.patch
+ApplyPatch tcp-Apply-device-TSO-segment-limit-earlier.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2294,6 +2304,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Aug 03 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc1.git0.2
+- CVE-2012-3412 sfc: potential rDOS through TCP MSS option (rhbz 844714 845558)
+
* Fri Aug 03 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc1.git0.1
- Linux v3.6-rc1
- Disable debugging options.