[kernel] r14154 - dists/etch-security/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Thu Aug 20 21:03:58 2009
New Revision: 14154

Log:
adjust to apply to 2.6.18

Modified:
   dists/etch-security/linux-2.6/debian/patches/bugfix/all/md-avoid-NULL-deref-with-suspend-sysfs-attribs.patch

Modified: dists/etch-security/linux-2.6/debian/patches/bugfix/all/md-avoid-NULL-deref-with-suspend-sysfs-attribs.patch
==============================================================================
--- dists/etch-security/linux-2.6/debian/patches/bugfix/all/md-avoid-NULL-deref-with-suspend-sysfs-attribs.patch	Thu Aug 20 20:42:31 2009	(r14153)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/all/md-avoid-NULL-deref-with-suspend-sysfs-attribs.patch	Thu Aug 20 21:03:58 2009	(r14154)
@@ -12,27 +12,27 @@
     Cc: stable at kernel.org
     Signed-off-by: NeilBrown <neilb at suse.de>
 
-Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+Adjusted to apply to Debian's 2.6.18 by dann frazier <dannf at debian.org>
 
-diff -urpN linux-source-2.6.26.orig/drivers/md/md.c linux-source-2.6.26/drivers/md/md.c
---- linux-source-2.6.26.orig/drivers/md/md.c	2009-06-19 23:16:56.000000000 -0600
-+++ linux-source-2.6.26/drivers/md/md.c	2009-08-18 22:42:48.000000000 -0600
-@@ -3123,7 +3123,8 @@ suspend_lo_store(mddev_t *mddev, const c
+diff -urpN linux-source-2.6.18.orig/drivers/md/md.c linux-source-2.6.18/drivers/md/md.c
+--- linux-source-2.6.18.orig/drivers/md/md.c	2009-08-15 12:05:07.000000000 -0600
++++ linux-source-2.6.18/drivers/md/md.c	2009-08-20 15:02:27.000000000 -0600
+@@ -2772,7 +2772,8 @@ suspend_lo_store(mddev_t *mddev, const c
  	char *e;
  	unsigned long long new = simple_strtoull(buf, &e, 10);
  
 -	if (mddev->pers->quiesce == NULL)
-+	if (mddev->pers == NULL ||
++	if (mddev->pers == NULL || 
 +	    mddev->pers->quiesce == NULL)
  		return -EINVAL;
  	if (buf == e || (*e && *e != '\n'))
  		return -EINVAL;
-@@ -3151,7 +3152,8 @@ suspend_hi_store(mddev_t *mddev, const c
+@@ -2800,7 +2801,8 @@ suspend_hi_store(mddev_t *mddev, const c
  	char *e;
  	unsigned long long new = simple_strtoull(buf, &e, 10);
  
 -	if (mddev->pers->quiesce == NULL)
-+	if (mddev->pers == NULL || 
++	if (mddev->pers == NULL ||
 +	    mddev->pers->quiesce == NULL)
  		return -EINVAL;
  	if (buf == e || (*e && *e != '\n'))