[prev in list] [next in list] [prev in thread] [next in thread]
List: meego-commits
Subject: [meego-commits] 19557: Changes to
From: Qi Wang <no_reply () build ! meego ! com>
Date: 2011-05-31 22:53:16
Message-ID: 20110531225316.0F38C10A637 () mail ! meego ! com
[Download RAW message or body]
Hi,
I have made the following changes to kernel-adaptation-intel-automotive in project \
MeeGo:1.2:oss:Testing. Please review and accept ASAP.
Thank You,
Qi Wang
[This message was auto-generated]
---
Request #19557:
submit: devel:kernel/kernel-adaptation-intel-automotive(r35)(update) -> \
MeeGo:1.2:oss:Testing/kernel-adaptation-intel-automotive
Message:
None
State: new 2011-05-31T15:53:05 qi
Comment: None
changes files:
--------------
--- kernel-adaptation-intel-automotive.changes
+++ kernel-adaptation-intel-automotive.changes
@@ -0,0 +1,10 @@
+* Mon May 30 2011 Qi Wang <qi.wang@intel.com> - 2.6.37.6
+- BMC #15809 - CVE-2011-0463,1163 Two function's improperly data handling allows \
local user to obtain potentially sensitive information +- BMC #15611. Add \
linux-2.6.37-ml7213-eg20t-0006-uart.patch to make PCH_UART work. This patch isn't \
accepted by the upstream now. +
+* Fri May 27 2011 Qi Wang <qi.wang@intel.com> - 2.6.37.6
+- BMC #17042. Remove unnecessary debug information.
+
+* Wed May 17 2011 Andy Ross <andy.ross@windriver.com> - 2.6.37.6
+- BMC #17774 - Add include/xen tree to devel subpackage
+
new:
----
linux-2.6.37-cve-0001-Treat-writes-as-new-when-holes-span-across-page-boun.patch
linux-2.6.37-ml7213-eg20t-0006-uart.patch
spec files:
-----------
--- kernel-adaptation-intel-automotive.spec
+++ kernel-adaptation-intel-automotive.spec
@@ -194,6 +194,7 @@
Patch17: linux-2.6.37-ml7213-eg20t-0003-uart.patch
Patch18: linux-2.6.37-ml7213-eg20t-0004-dma.patch
Patch19: linux-2.6.37-ml7213-eg20t-0005-gbe.patch
+Patch20: linux-2.6.37-ml7213-eg20t-0006-uart.patch
# End of EG20T and ML7213 Patches
#
#####################################################################
@@ -202,9 +203,9 @@
#
# EMGD patches
#
-Patch20: linux-2.6.37-emgd-0001-add-makefile.patch
-Patch21: linux-2.6.37-emgd-0002-1893-build.patch
-Patch22: linux-2.6.37-emgd-0003-1922-build.patch
+Patch21: linux-2.6.37-emgd-0001-add-makefile.patch
+Patch22: linux-2.6.37-emgd-0002-1893-build.patch
+Patch23: linux-2.6.37-emgd-0003-1922-build.patch
#
# End of EMGD Patches
#
@@ -214,17 +215,25 @@
#
# Russellville patches
#
-Patch23: linux-2.6.37-adjust-adv7180-timblogiw-to-be-NTSC.patch
-Patch24: linux-2.6.37-rv-add-timbi2s.patch
-Patch25: linux-2.6.37-rv-add-timblogiw.patch
-Patch26: linux-2.6.37-rv-fix-tx-cache-issue-ks8842.patch
-Patch27: linux-2.6.37-timberdale-enable-devices.patch
-Patch28: linux-2.6.37-timb-radio-pickup-dsp.patch
+Patch24: linux-2.6.37-adjust-adv7180-timblogiw-to-be-NTSC.patch
+Patch25: linux-2.6.37-rv-add-timbi2s.patch
+Patch26: linux-2.6.37-rv-add-timblogiw.patch
+Patch27: linux-2.6.37-rv-fix-tx-cache-issue-ks8842.patch
+Patch28: linux-2.6.37-timberdale-enable-devices.patch
+Patch29: linux-2.6.37-timb-radio-pickup-dsp.patch
#
# End of EMGD Patches
#
#####################################################################
+#####################################################################
+#
+# Kernel CVE patches
+Patch30: linux-2.6.37-cve-0001-Treat-writes-as-new-when-holes-span-across-page-boun.patch
+#
+# End of Kernel CVE patches
+#####################################################################
+
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -391,6 +400,8 @@
%patch18 -p1
# linux-2.6.37-ml7213-eg20t-0005-gbe.patch
%patch19 -p1
+# linux-2.6.37-ml7213-eg20t-0006-uart.patch
+%patch20 -p1
# End of EG20T and ML7213 Patches
#
#####################################################################
@@ -400,11 +411,11 @@
# EMGD patches
#
# linux-2.6.37-emgd-0001-add-makefile.patch
-%patch20 -p1
-# linux-2.6.37-emgd-0002-1893-build.patch
%patch21 -p1
-# linux-2.6.37-emgd-0003-1922-build.patch
+# linux-2.6.37-emgd-0002-1893-build.patch
%patch22 -p1
+# linux-2.6.37-emgd-0003-1922-build.patch
+%patch23 -p1
#
# End of EMGD Patches
#
@@ -415,22 +426,31 @@
# Russellville patches
#
# linux-2.6.37-adjust-adv7180-timblogiw-to-be-NTSC.patch
-%patch23 -p1
-# linux-2.6.37-rv-add-timbi2s.patch
%patch24 -p1
-# linux-2.6.37-rv-add-timblogiw.patch
+# linux-2.6.37-rv-add-timbi2s.patch
%patch25 -p1
-# linux-2.6.37-rv-fix-tx-cache-issue-ks8842.patch
+# linux-2.6.37-rv-add-timblogiw.patch
%patch26 -p1
-# linux-2.6.37-timberdale-enable-devices.patch
+# linux-2.6.37-rv-fix-tx-cache-issue-ks8842.patch
%patch27 -p1
-# linux-2.6.37-timb-radio-pickup-dsp.patch
+# linux-2.6.37-timberdale-enable-devices.patch
%patch28 -p1
+# linux-2.6.37-timb-radio-pickup-dsp.patch
+%patch29 -p1
#
# End of EMGD Patches
#
#####################################################################
+#####################################################################
+#
+# Kernel CVE patches
+# linux-2.6.37-cve-0001-Treat-writes-as-new-when-holes-span-across-page-boun.patch
+%patch30 -p1
+#
+# End of Kernel CVE patches
+#####################################################################
+
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
cp %{SOURCE15} .
@@ -601,7 +621,7 @@
%endif
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
cd include
- cp -a acpi asm-generic config crypto drm generated keys linux math-emu media \
mtd net pcmcia rdma rxrpc scsi sound video trace \
$RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include + cp -a acpi asm-generic \
config crypto drm generated keys linux math-emu media mtd net pcmcia rdma rxrpc scsi \
sound video trace xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
# Make sure the Makefile and version.h have a matching timestamp so that
# external modules can be built
other changes:
--------------
++++++ config-generic
--- config-generic
+++ config-generic
@@ -1524,7 +1524,7 @@
CONFIG_DEVPORT=y
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_HELPER_AUTO is not set
#
@@ -2652,7 +2652,7 @@
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_SHIRQ=y
+# CONFIG_DEBUG_SHIRQ is not set
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
@@ -2680,11 +2680,11 @@
# CONFIG_DEBUG_VIRTUAL is not set
# CONFIG_DEBUG_WRITECOUNT is not set
# CONFIG_DEBUG_MEMORY_INIT it not set
-CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_LIST is not set
# CONFIG_DEBUG_SG is not set
-CONFIG_DEBUG_NOTIFIERS=y
+# CONFIG_DEBUG_NOTIFIERS is not set
CONFIG_FRAME_POINTER=y
-CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
++++++ kernel.spec.in
--- kernel.spec.in
+++ kernel.spec.in
@@ -423,7 +423,7 @@
%endif
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
cd include
- cp -a acpi asm-generic config crypto drm generated keys linux math-emu media \
mtd net pcmcia rdma rxrpc scsi sound video trace \
$RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include + cp -a acpi asm-generic \
config crypto drm generated keys linux math-emu media mtd net pcmcia rdma rxrpc scsi \
sound video trace xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
# Make sure the Makefile and version.h have a matching timestamp so that
# external modules can be built
++++++ linux-2.6.37-cve-0001-Treat-writes-as-new-when-holes-span-across-page-boun.patch \
(new)
--- linux-2.6.37-cve-0001-Treat-writes-as-new-when-holes-span-across-page-boun.patch
+++ linux-2.6.37-cve-0001-Treat-writes-as-new-when-holes-span-across-page-boun.patch
+From 272b62c1f0f6f742046e45b50b6fec98860208a0 Mon Sep 17 00:00:00 2001
+From: Goldwyn Rodrigues <rgoldwyn@gmail.com>
+Date: Thu, 17 Feb 2011 09:44:40 -0600
+Subject: [PATCH] Treat writes as new when holes span across page boundaries
+
+When a hole spans across page boundaries, the next write forces
+a read of the block. This could end up reading existing garbage
+data from the disk in ocfs2_map_page_blocks. This leads to
+non-zero holes. In order to avoid this, mark the writes as new
+when the holes span across page boundaries.
+
+Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.de>
+Signed-off-by: jlbec <jlbec@evilplan.org>
+
+diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
+index 0d44b77..b5d7fb9 100644
+--- a/fs/ocfs2/aops.c
++++ b/fs/ocfs2/aops.c
+@@ -1015,6 +1015,12 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, \
u64 *p_blkno, + ocfs2_figure_cluster_boundaries(OCFS2_SB(inode->i_sb), cpos,
+ &cluster_start, &cluster_end);
+
++ /* treat the write as new if the a hole/lseek spanned across
++ * the page boundary.
++ */
++ new = new | ((i_size_read(inode) <= page_offset(page)) &&
++ (page_offset(page) <= user_pos));
++
+ if (page == wc->w_target_page) {
+ map_from = user_pos & (PAGE_CACHE_SIZE - 1);
+ map_to = map_from + user_len;
+--
+1.7.2.3
+
++++++ linux-2.6.37-ml7213-eg20t-0006-uart.patch (new)
--- linux-2.6.37-ml7213-eg20t-0006-uart.patch
+++ linux-2.6.37-ml7213-eg20t-0006-uart.patch
+diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index \
738cec9..2678d9d 100644 +--- a/drivers/serial/8250_pci.c
++++ b/drivers/serial/8250_pci.c
+@@ -2528,6 +2528,19 @@
+ return -EINVAL;
+ }
+
++#if defined(CONFIG_SERIAL_PCH_UART) || defined(CONFIG_SERIAL_PCH_UART_MODULE)
++ if ((dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == 0x8811) ||
++ (dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == 0x8812) ||
++ (dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == 0x8813) ||
++ (dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == 0x8814) ||
++ (dev->vendor == 0x10DB && dev->device == 0x8027) ||
++ (dev->vendor == 0x10DB && dev->device == 0x8028) ||
++ (dev->vendor == 0x10DB && dev->device == 0x8029) ||
++ (dev->vendor == 0x10DB && dev->device == 0x800C) ||
++ (dev->vendor == 0x10DB && dev->device == 0x800D))
++ return -ENODEV;
++#endif
++
+ board = &pci_boards[ent->driver_data];
+
+ rc = pci_enable_device(dev);
+--
+1.7.4
+
++++++ series
--- series
+++ series
@@ -44,6 +44,7 @@
linux-2.6.37-ml7213-eg20t-0003-uart.patch
linux-2.6.37-ml7213-eg20t-0004-dma.patch
linux-2.6.37-ml7213-eg20t-0005-gbe.patch
+linux-2.6.37-ml7213-eg20t-0006-uart.patch
# End of EG20T and ML7213 Patches
#
#####################################################################
@@ -74,3 +75,11 @@
# End of EMGD Patches
#
#####################################################################
+
+#####################################################################
+#
+# Kernel CVE patches
+linux-2.6.37-cve-0001-Treat-writes-as-new-when-holes-span-across-page-boun.patch
+#
+# End of Kernel CVE patches
+#####################################################################
_______________________________________________
MeeGo-commits mailing list
MeeGo-commits@meego.com
http://lists.meego.com/listinfo/meego-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic