From 24acf94b9d7d71ba6532824da6a51475af45ddf5 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@suse.de>
Date: Fri, 4 May 2007 19:45:26 +0000
Subject: [PATCH] Fix rediff error in mangle_on_audit-3.diff. Rediff for line
 offsets.

---
 kernel-patches/for-mainline/mangle_on_audit-3.diff | 14 +++-----------
 kernel-patches/for-mainline/mangle_on_audit-5.diff |  4 ++--
 kernel-patches/for-mainline/mangle_on_audit-6.diff |  4 ++--
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/kernel-patches/for-mainline/mangle_on_audit-3.diff b/kernel-patches/for-mainline/mangle_on_audit-3.diff
index 8b3adb482..a91a33d05 100644
--- a/kernel-patches/for-mainline/mangle_on_audit-3.diff
+++ b/kernel-patches/for-mainline/mangle_on_audit-3.diff
@@ -4,10 +4,10 @@
  security/apparmor/apparmor.h         |    2 -
  security/apparmor/apparmorfs.c       |    8 +++----
  security/apparmor/lsm.c              |   17 +++++++---------
- security/apparmor/main.c             |    8 +++----
+ security/apparmor/main.c             |    7 +++---
  security/apparmor/module_interface.c |   10 ++++-----
  security/apparmor/procattr.c         |   37 ++++++++++++++++-------------------
- 6 files changed, 38 insertions(+), 44 deletions(-)
+ 6 files changed, 38 insertions(+), 43 deletions(-)
 
 --- a/security/apparmor/apparmor.h
 +++ b/security/apparmor/apparmor.h
@@ -72,15 +72,7 @@
  		error = aa_setprocattr_setprofile(task, args);
 --- a/security/apparmor/main.c
 +++ b/security/apparmor/main.c
-@@ -1024,7 +1024,6 @@ repeat:
- 		if (PTR_ERR(old_profile) == -ESTALE)
- 			goto repeat;
- 		if (PTR_ERR(old_profile) == -EPERM) {
--			filename = mangle(filename, buffer);
- 			aa_audit_message(profile, GFP_KERNEL,
- 					 "REJECTING exec(2) of image '%s'. "
- 					 "Unable to change profile, ptraced by "
-@@ -1191,9 +1190,10 @@ int aa_change_hat(const char *hat_name, 
+@@ -1191,9 +1191,10 @@ int aa_change_hat(const char *hat_name, 
  
  	/* Dump out above debugging in WARN mode if we are in AUDIT mode */
  	if (APPARMOR_AUDIT(aa_task_context(current))) {
diff --git a/kernel-patches/for-mainline/mangle_on_audit-5.diff b/kernel-patches/for-mainline/mangle_on_audit-5.diff
index f69a9118a..13037efb0 100644
--- a/kernel-patches/for-mainline/mangle_on_audit-5.diff
+++ b/kernel-patches/for-mainline/mangle_on_audit-5.diff
@@ -52,7 +52,7 @@
  				 "image '%s'", name);
  			profile = aa_dup_profile(null_complain_profile);
  		} else {
-@@ -1056,7 +1056,7 @@ repeat:
+@@ -1057,7 +1057,7 @@ repeat:
  	}
  
  	if (complain && new_profile == null_complain_profile)
@@ -61,7 +61,7 @@
  			 "");
  
  cleanup:
-@@ -1144,7 +1144,7 @@ static int do_change_hat(const char *hat
+@@ -1145,7 +1145,7 @@ static int do_change_hat(const char *hat
  		struct aa_profile *profile = cxt->profile;
  
  		if (APPARMOR_COMPLAIN(cxt)) {
diff --git a/kernel-patches/for-mainline/mangle_on_audit-6.diff b/kernel-patches/for-mainline/mangle_on_audit-6.diff
index adf1f157c..2f3d8b0fd 100644
--- a/kernel-patches/for-mainline/mangle_on_audit-6.diff
+++ b/kernel-patches/for-mainline/mangle_on_audit-6.diff
@@ -83,7 +83,7 @@
  			profile = aa_dup_profile(null_complain_profile);
  		} else {
  			aa_audit_message(profile, GFP_KERNEL, "REJECTING "
-@@ -1056,9 +1062,11 @@ repeat:
+@@ -1057,9 +1063,11 @@ repeat:
  	}
  
  	if (complain && new_profile == null_complain_profile)
@@ -98,7 +98,7 @@
  cleanup:
  	aa_put_name_buffer(buffer);
  	if (IS_ERR(new_profile))
-@@ -1144,8 +1152,11 @@ static int do_change_hat(const char *hat
+@@ -1145,8 +1153,11 @@ static int do_change_hat(const char *hat
  		struct aa_profile *profile = cxt->profile;
  
  		if (APPARMOR_COMPLAIN(cxt)) {