rpms/kernel/F-11 fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch, NONE, 1.1 kernel.spec, 1.1783, 1.1784

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22403

Modified Files:
	kernel.spec 
Added Files:
	fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch 
Log Message:
* Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.10-105
- fuse: fix kunmap in fuse_ioctl_copy_user, #549400


fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch:
 file.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch ---
From: Jens Axboe <jens.axboe at oracle.com>
Date: Tue, 3 Nov 2009 10:40:44 +0000 (+0100)
Subject: fuse: fix kunmap in fuse_ioctl_copy_user
X-Git-Tag: v2.6.32-rc7~67^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0bd87182d3ab18a32a8e9175d3f68754c58e3432

fuse: fix kunmap in fuse_ioctl_copy_user

Looks like another victim of the confusing kmap() vs kmap_atomic() API
differences.

Reported-by: Todor Gyumyushev <yodor1 at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Tejun Heo <tj at kernel.org>
Cc: stable at kernel.org
---

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 5887a63..c18913a 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1600,7 +1600,7 @@ static int fuse_ioctl_copy_user(struct page **pages, struct iovec *iov,
 			kaddr += copy;
 		}
 
-		kunmap(map);
+		kunmap(page);
 	}
 
 	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1783
retrieving revision 1.1784
diff -u -p -r1.1783 -r1.1784
--- kernel.spec	9 Dec 2009 01:28:18 -0000	1.1783
+++ kernel.spec	24 Dec 2009 16:16:11 -0000	1.1784
@@ -841,6 +841,9 @@ Patch16470: sata_nv-use-hardreset-only-f
 # rhbz#538734 (CVE-tbd) [f60311d5f7670d9539b424e4ed8b5c0872fc9e83]
 Patch16471: fuse-prevent-fuse_put_request-in-invalid-ptr.patch
 
+# rhbz#549400 [0bd87182d3ab18a32a8e9175d3f68754c58e3432]
+Patch16472: fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1580,6 +1583,9 @@ ApplyPatch sata_nv-make-sure-link-is-bro
 
 ApplyPatch fuse-prevent-fuse_put_request-in-invalid-ptr.patch
 
+# rhbz#549400 [0bd87182d3ab18a32a8e9175d3f68754c58e3432]
+ApplyPatch fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2168,6 +2174,9 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.10-105
+- fuse: fix kunmap in fuse_ioctl_copy_user, #549400
+
 * Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.10-104
 - Copy fix for #540580 from F-12.