rpms/kernel/devel linux-2.6.17-cachefiles-memory.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2253.2.2, 1.2253.2.3

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5974

Modified Files:
      Tag: kernel-2_6_16-1_2253_FC6_fscache
	kernel-2.6.spec 
Added Files:
      Tag: kernel-2_6_16-1_2253_FC6_fscache
	linux-2.6.17-cachefiles-memory.patch 
Log Message:
Fixed problem of freeing a NULL pointer


linux-2.6.17-cachefiles-memory.patch:
 cf-interface.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6.17-cachefiles-memory.patch ---
--- linux-2.6.16.noarch/fs/cachefiles/cf-interface.c.orig	2006-07-07 17:11:40.471809000 -0400
+++ linux-2.6.16.noarch/fs/cachefiles/cf-interface.c	2006-07-07 17:17:34.103733000 -0400
@@ -634,9 +634,10 @@
 out:
 	if (backpage)
 		page_cache_release(backpage);
-	fscache_put_context(object->fscache.cookie, monitor->context);
-	kfree(monitor);
-
+	if (monitor) {
+		fscache_put_context(object->fscache.cookie, monitor->context);
+		kfree(monitor);
+	}
 	_leave(" = %d", ret);
 	return ret;
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2253.2.2
retrieving revision 1.2253.2.3
diff -u -r1.2253.2.2 -r1.2253.2.3
--- kernel-2.6.spec	8 Jun 2006 19:01:26 -0000	1.2253.2.2
+++ kernel-2.6.spec	7 Jul 2006 21:54:02 -0000	1.2253.2.3
@@ -421,8 +421,9 @@
 Patch7005: linux-2.6.17-fscache-fedora.patch
 Patch7006: linux-2.6.17-cachefiles.patch
 Patch7007: linux-2.6.17-cachefiles-misc.patch
-Patch7008: linux-2.6.17-nfs-fscache.patch
-Patch7009: linux-2.6.17-afs-fscache.patch
+Patch7008: linux-2.6.17-cachefiles-memory.patch
+Patch7009: linux-2.6.17-nfs-fscache.patch
+Patch7010: linux-2.6.17-afs-fscache.patch
 
 
 #
@@ -1097,6 +1098,7 @@
 %patch7007 -p1
 %patch7008 -p1
 %patch7009 -p1
+%patch7010 -p1
 
 #
 # final stuff
@@ -1797,6 +1799,9 @@
 %endif
 
 %changelog
+* Fri Jul  7 2006 Steve Dickson <steved at redhat.com>
+* Fixed problem of freeing a NULL pointer
+
 * Thu Jun  8 2006 Steve Dickson <steved at redhat.com>
 - Added cachefs bits to kernel-2_6_16-1_2253_FC6_fscache branch