SOURCES (LINUX_2_6): kernel-apparmor.patch, kernel-apparmor-after-grsec_ful...

[arekm]

Author: arekm                        Date: Mon Mar 16 17:53:04 2009 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- add upstream fix-deleted-leak.diff

---- Files affected:
SOURCES:
   kernel-apparmor.patch (1.1.2.7 -> 1.1.2.8) , kernel-apparmor-after-grsec_full.patch (1.1.2.7 -> 1.1.2.8) 

---- Diffs:

================================================================
Index: SOURCES/kernel-apparmor.patch
diff -u SOURCES/kernel-apparmor.patch:1.1.2.7 SOURCES/kernel-apparmor.patch:1.1.2.8
--- SOURCES/kernel-apparmor.patch:1.1.2.7	Mon Mar 16 18:31:39 2009
+++ SOURCES/kernel-apparmor.patch	Mon Mar 16 18:52:58 2009
@@ -9043,3 +9043,21 @@
  
  /* Namespaces */
  #define XATTR_OS2_PREFIX "os2."
+---
+ security/apparmor/main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/security/apparmor/main.c
++++ b/security/apparmor/main.c
+@@ -503,10 +503,10 @@ static char *aa_get_name(struct dentry *
+ 			*buffer = buf;
+ 			return name;
+ 		}
++		kfree(buf);
+ 		if (PTR_ERR(name) != -ENAMETOOLONG)
+ 			return name;
+ 
+-		kfree(buf);
+ 		size <<= 1;
+ 		if (size > apparmor_path_max)
+ 			return ERR_PTR(-ENAMETOOLONG);

================================================================
Index: SOURCES/kernel-apparmor-after-grsec_full.patch
diff -u SOURCES/kernel-apparmor-after-grsec_full.patch:1.1.2.7 SOURCES/kernel-apparmor-after-grsec_full.patch:1.1.2.8
--- SOURCES/kernel-apparmor-after-grsec_full.patch:1.1.2.7	Mon Mar 16 18:42:35 2009
+++ SOURCES/kernel-apparmor-after-grsec_full.patch	Mon Mar 16 18:52:59 2009
@@ -9219,3 +9219,21 @@
  
  	if (rc == 0)
  		rc = smk_curacc(smk_of_inode(dentry->d_inode), MAY_WRITE);
+---
+ security/apparmor/main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/security/apparmor/main.c
++++ b/security/apparmor/main.c
+@@ -503,10 +503,10 @@ static char *aa_get_name(struct dentry *
+ 			*buffer = buf;
+ 			return name;
+ 		}
++		kfree(buf);
+ 		if (PTR_ERR(name) != -ENAMETOOLONG)
+ 			return name;
+ 
+-		kfree(buf);
+ 		size <<= 1;
+ 		if (size > apparmor_path_max)
+ 			return ERR_PTR(-ENAMETOOLONG);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-apparmor.patch?r1=1.1.2.7&r2=1.1.2.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-apparmor-after-grsec_full.patch?r1=1.1.2.7&r2=1.1.2.8&f=u