[kernel] r15077 - dists/etch-security/linux-2.6.24/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Mon Feb  1 04:41:34 2010
New Revision: 15077

Log:
adjust to apply

Modified:
   dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/fuse-prevent-fuse_put_request-on-invalid-pointer.patch

Modified: dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/fuse-prevent-fuse_put_request-on-invalid-pointer.patch
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/fuse-prevent-fuse_put_request-on-invalid-pointer.patch	Mon Feb  1 04:36:49 2010	(r15076)
+++ dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/fuse-prevent-fuse_put_request-on-invalid-pointer.patch	Mon Feb  1 04:41:34 2010	(r15077)
@@ -12,12 +12,12 @@
     Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
     Cc: stable at kernel.org
 
-Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+Adjusted to apply to Debian's 2.6.24 by dann frazier <dannf at debian.org>
 
-diff -urpN linux-source-2.6.26.orig/fs/fuse/file.c linux-source-2.6.26/fs/fuse/file.c
---- linux-source-2.6.26.orig/fs/fuse/file.c	2008-07-13 15:51:29.000000000 -0600
-+++ linux-source-2.6.26/fs/fuse/file.c	2009-11-25 12:29:51.000000000 -0700
-@@ -1005,7 +1005,8 @@ static ssize_t fuse_direct_io(struct fil
+diff -urpN linux-source-2.6.24.orig/fs/fuse/file.c linux-source-2.6.24/fs/fuse/file.c
+--- linux-source-2.6.24.orig/fs/fuse/file.c	2010-01-31 21:39:36.000000000 -0700
++++ linux-source-2.6.24/fs/fuse/file.c	2010-01-31 21:35:18.000000000 -0700
+@@ -679,7 +679,8 @@ static ssize_t fuse_direct_io(struct fil
  				break;
  		}
  	}
@@ -25,5 +25,5 @@
 +	if (!IS_ERR(req))
 +		fuse_put_request(fc, req);
  	if (res > 0) {
- 		if (write)
- 			fuse_write_update_size(inode, pos);
+ 		if (write) {
+ 			spin_lock(&fc->lock);