Author: arekm Date: Sun Mar 29 12:12:23 2009 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for .29
---- Files affected:
SOURCES:
kernel-unionfs-apparmor.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/kernel-unionfs-apparmor.patch
diff -u SOURCES/kernel-unionfs-apparmor.patch:1.1.2.1
SOURCES/kernel-unionfs-apparmor.patch:1.1.2.2
--- SOURCES/kernel-unionfs-apparmor.patch:1.1.2.1 Mon Nov 3 02:27:16 2008
+++ SOURCES/kernel-unionfs-apparmor.patch Sun Mar 29 14:12:17 2009
@@ -54,15 +54,15 @@
/*
* Selinux depends on "security.*" xattrs, so to maintain
* the security of copied-up files, if Selinux is active,
-@@ -93,8 +94,8 @@ static int copyup_xattrs(struct dentry *
- */
- if (err == -EPERM && !capable(CAP_FOWNER)) {
- cap_raise(current->cap_effective, CAP_FOWNER);
+@@ -103,8 +103,8 @@
+ }
+ cap_raise(new_creds->cap_effective, CAP_FOWNER);
+ old_creds = override_creds(new_creds);
- err = vfs_setxattr(new_lower_dentry, name_list,
- attr_value, size, 0);
+ err = vfs_setxattr(new_lower_dentry, NULL, name_list,
+ attr_value, size, 0, NULL);
- cap_lower(current->cap_effective, CAP_FOWNER);
+ revert_creds(old_creds);
}
if (err < 0)
@@ -136,14 +136,14 @@ static int copyup_permissions(struct sup
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-unionfs-apparmor.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
