SOURCES (LINUX_2_6): kernel-apparmor-after-grsec_full.patch - partially upd...

[adamg]

Author: adamg                        Date: Sun Jan 18 02:30:24 2009 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- partially updated to 2.6.28 (two more hunks left); saving work

---- Files affected:
SOURCES:
   kernel-apparmor-after-grsec_full.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/kernel-apparmor-after-grsec_full.patch
diff -u SOURCES/kernel-apparmor-after-grsec_full.patch:1.1.2.2 SOURCES/kernel-apparmor-after-grsec_full.patch:1.1.2.3
--- SOURCES/kernel-apparmor-after-grsec_full.patch:1.1.2.2	Fri Oct 31 16:33:04 2008
+++ SOURCES/kernel-apparmor-after-grsec_full.patch	Sun Jan 18 03:30:18 2009
@@ -2,9 +2,9 @@
 --- linux-2.6.27./fs/afs/dir.c	2008-10-10 00:13:53.000000000 +0200
 +++ linux-2.6.27/fs/afs/dir.c	2008-10-29 02:02:01.686215981 +0100
 @@ -45,6 +45,7 @@ const struct file_operations afs_dir_fil
- 	.release	= afs_release,
  	.readdir	= afs_readdir,
  	.lock		= afs_lock,
+ 	.llseek		= generic_file_llseek,
 +	.fsetattr	= afs_fsetattr,
  };
  
@@ -1125,13 +1125,13 @@
 --- linux-2.6.27./fs/nfsd/nfs4recover.c	2008-10-10 00:13:53.000000000 +0200
 +++ linux-2.6.27/fs/nfsd/nfs4recover.c	2008-10-29 02:02:00.593071537 +0100
 @@ -158,7 +158,8 @@ nfsd4_create_clid_dir(struct nfs4_client
- 	status = mnt_want_write(rec_dir.path.mnt);
+ 	status = mnt_want_write(rec_dir.mnt);
  	if (status)
  		goto out_put;
--	status = vfs_mkdir(rec_dir.path.dentry->d_inode, dentry, S_IRWXU);
-+	status = vfs_mkdir(rec_dir.path.dentry->d_inode, dentry,
-+			   rec_dir.path.mnt, S_IRWXU);
- 	mnt_drop_write(rec_dir.path.mnt);
+-	status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU);
++	status = vfs_mkdir(rec_dir.dentry->d_inode, dentry,
++			   rec_dir.mnt, S_IRWXU);
+ 	mnt_drop_write(rec_dir.mnt);
  out_put:
  	dput(dentry);
 @@ -263,7 +264,7 @@ nfsd4_remove_clid_file(struct dentry *di
@@ -1176,7 +1176,7 @@
  		err = nfserrno(host_err);
  		fh_unlock(fhp);
  	}
-@@ -408,11 +408,12 @@ out_nfserr:
+@@ -408,12 +408,13 @@ out_nfserr:
  #if defined(CONFIG_NFSD_V2_ACL) || \
      defined(CONFIG_NFSD_V3_ACL) || \
      defined(CONFIG_NFSD_V4)
@@ -1185,6 +1185,7 @@
 +			     char *key, void **buf)
  {
  	ssize_t buflen;
+ 	ssize_t ret;
  
 -	buflen = vfs_getxattr(dentry, key, NULL, 0);
 +	buflen = vfs_getxattr(dentry, mnt, key, NULL, 0, NULL);
================================================================

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