Author: waldi
Date: Mon Mar 17 10:55:29 2008
New Revision: 10913
Log:
Merge /dists/sid/linux-2.6, 2.6.24-4.
Added:
dists/etch/linux-2.6.24/debian/patches/bugfix/all/stable/2.6.24.2.patch
Modified:
dists/etch/linux-2.6.24/ (props changed)
dists/etch/linux-2.6.24/debian/changelog
dists/etch/linux-2.6.24/debian/config/arm/config.iop32x
dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx
dists/etch/linux-2.6.24/debian/patches/series/4
Modified: dists/etch/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch/linux-2.6.24/debian/changelog (original)
+++ dists/etch/linux-2.6.24/debian/changelog Mon Mar 17 10:55:29 2008
@@ -11,7 +11,7 @@
-- Bastian Blank <[EMAIL PROTECTED]> Mon, 17 Mar 2008 11:46:39 +0100
-linux-2.6 (2.6.24-4) UNRELEASED; urgency=low
+linux-2.6 (2.6.24-4) unstable; urgency=low
* Add stable release 2.6.24.1:
- splice: missing user pointer access verification (CVE-2008-0009/10)
@@ -60,7 +60,16 @@
- slab: fix bootstrap on memoryless node
- DVB: cx23885: add missing subsystem ID for Hauppauge HVR1800 Retail
- -- Bastian Blank <[EMAIL PROTECTED]> Fri, 08 Feb 2008 22:26:16 +0100
+ [ Martin Michlmayr ]
+ * [arm/ixp4xx] Enble ATA_OVER_ETH, requested by Nicola Fankhauser.
+ * [arm/iop32x] Enble ATA_OVER_ETH.
+
+ [ Bastian Blank ]
+ * Add stable release 2.6.24.2:
+ - splice: fix user pointer access in get_iovec_page_array()
+ (CVE-2008-0600, closes: #464945)
+
+ -- Bastian Blank <[EMAIL PROTECTED]> Mon, 11 Feb 2008 12:29:23 +0100
linux-2.6 (2.6.24-3) unstable; urgency=low
Modified: dists/etch/linux-2.6.24/debian/config/arm/config.iop32x
==============================================================================
--- dists/etch/linux-2.6.24/debian/config/arm/config.iop32x (original)
+++ dists/etch/linux-2.6.24/debian/config/arm/config.iop32x Mon Mar 17
10:55:29 2008
@@ -439,7 +439,7 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192
# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
+CONFIG_ATA_OVER_ETH=m
#
# ATA/ATAPI/MFM/RLL support
Modified: dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx (original)
+++ dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx Mon Mar 17
10:55:29 2008
@@ -585,7 +585,7 @@
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192
# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
+CONFIG_ATA_OVER_ETH=m
#
# ATA/ATAPI/MFM/RLL support
Added: dists/etch/linux-2.6.24/debian/patches/bugfix/all/stable/2.6.24.2.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6.24/debian/patches/bugfix/all/stable/2.6.24.2.patch
Mon Mar 17 10:55:29 2008
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index e6a6eec..6f79564 100644
+diff --git a/fs/splice.c b/fs/splice.c
+index 36fdc61..e313478 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1239,7 +1239,7 @@ static int get_iovec_page_array(const struct iovec
__user *iov,
+ if (unlikely(!len))
+ break;
+ error = -EFAULT;
+- if (unlikely(!base))
++ if (!access_ok(VERIFY_READ, base, len))
+ break;
+
+ /*
Modified: dists/etch/linux-2.6.24/debian/patches/series/4
==============================================================================
--- dists/etch/linux-2.6.24/debian/patches/series/4 (original)
+++ dists/etch/linux-2.6.24/debian/patches/series/4 Mon Mar 17 10:55:29 2008
@@ -1,2 +1,3 @@
- bugfix/all/slab-fix-bootstrap-on-memoryless-node.patch
+ bugfix/all/stable/2.6.24.1.patch
++ bugfix/all/stable/2.6.24.2.patch
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
