3.3.7-3.fc16.gnu

2 files changed, 25 insertions, 106 deletions

diff --git a/freed-ora/current/f16/config-generic b/freed-ora/current/f16/config-generic
index f71332e09..818d6cc8c 100644
--- a/freed-ora/current/f16/config-generic
+++ b/freed-ora/current/f16/config-generic
@@ -2687,26 +2687,7 @@ CONFIG_RADIO_WL1273=m
 CONFIG_RADIO_WL128X=m
 
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER_CUSTOMISE=y
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18212=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
 
 #
 # Digital Video Broadcasting Devices
@@ -2717,81 +2698,13 @@ CONFIG_DVB_NET=y
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
 
-CONFIG_DVB_FE_CUSTOMISE=y
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_S5H1432=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_CXD2820R=m
+# CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_AZ6007=m
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
 
 #
-# Supported Frontend Modules
+# Supported DVB Modules
 #
 CONFIG_DVB_BT8XX=m
 CONFIG_DVB_BUDGET_CORE=m
@@ -2809,23 +2722,11 @@ CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_PCTV452E=m
 CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_IT913X_FE=m
 CONFIG_DVB_DM1105=m
-CONFIG_DVB_S921=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_DUMMY_FE=m
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_MB86A20S=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_DIB9000=m
-CONFIG_DVB_HD29L2=m
-CONFIG_DVB_STV0367=m
 
 #
 # Supported SAA7146 based PCI Adapters
@@ -2837,9 +2738,6 @@ CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=m
 CONFIG_DVB_BUDGET_PATCH=m
 
-#
-# Supported USB Adapters
-#
 CONFIG_DVB_TTUSB_BUDGET=m
 
 #
diff --git a/freed-ora/current/f16/kernel.spec b/freed-ora/current/f16/kernel.spec
index e8e5d3796..80fb8838e 100644
--- a/freed-ora/current/f16/kernel.spec
+++ b/freed-ora/current/f16/kernel.spec
@@ -54,7 +54,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 3
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -850,6 +850,12 @@ Patch22019: rtl818x-fix-sleeping-function-called-from-invalid-context.patch
 #rhbz 822120
 Patch22020: rtlwifi-fix-for-race-condition-when-firmware-is-cach.patch
 
+#rhbz 822825 822821 CVE-2012-2372
+Patch22021: mm-pmd_read_atomic-fix-32bit-PAE-pmd-walk-vs-pmd_populate-SMP-race-condition.patch
+
+#rhbz 824352 824345 CVE-2012-2390
+Patch22022: hugetlb-fix-resv_map-leak-in-error-path.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1575,6 +1581,12 @@ ApplyPatch rtl818x-fix-sleeping-function-called-from-invalid-context.patch
 #rhbz 822120
 ApplyPatch rtlwifi-fix-for-race-condition-when-firmware-is-cach.patch
 
+#rhbz 822825 822821 CVE-2012-2372
+ApplyPatch mm-pmd_read_atomic-fix-32bit-PAE-pmd-walk-vs-pmd_populate-SMP-race-condition.patch
+
+#rhbz 824352 824345 CVE-2012-2390
+ApplyPatch hugetlb-fix-resv_map-leak-in-error-path.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2313,6 +2325,15 @@ fi
 # and build.
 
 %changelog
+* Wed May 30 2012 Josh Boyer <jwboyer@redhat.com>
+- CVE-2012-2390 huge pages: memory leak on mmap failure (rhbz 824352 824345)
+
+* Fri May 25 2012 Mauro      Carvalho Chehab <mchehab@redhat.com>
+- Don't      manually customise tuners/frontends (rhbz 825203)
+
+* Thu May 24 2012 Josh Boyer <jwboyer@redhat.com>
+- CVE-2012-2372 mm: 32bit PAE pmd walk vs populate SMP race (rhbz 822821 822825)
+
 * Tue May 22 2012 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 3.3.7-gnu.