---

yaml --- r: 252955 b: refs/heads/master c: a5b2c5b h: refs/heads/master i: 252953: 117fe73 252951: 275f7e1 v: v3
git-mirror · Jun 1, 2011 · e7e1964 · e7e1964
1 parent ce5f041
commit e7e1964
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 603d04b2010976a52f62b7633f9999d104046900
+refs/heads/master: a5b2c5b2ad5853591a6cac6134cd0f599a720865
diff --git a/trunk/drivers/misc/kgdbts.c b/trunk/drivers/misc/kgdbts.c
@@ -304,10 +304,7 @@ static int check_and_rewind_pc(char *put_str, char *arg)
 		return 1;
 	}
 	/* Readjust the instruction pointer if needed */
-	ip += offset;
-#ifdef GDB_ADJUSTS_BREAK_OFFSET
-	instruction_pointer_set(&kgdbts_regs, ip);
-#endif
+	instruction_pointer_set(&kgdbts_regs, ip + offset);
 	return 0;
 }
 

diff --git a/trunk/security/apparmor/lsm.c b/trunk/security/apparmor/lsm.c
@@ -593,7 +593,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
 			sa.aad.op = OP_SETPROCATTR;
 			sa.aad.info = name;
 			sa.aad.error = -EINVAL;
-			return aa_audit(AUDIT_APPARMOR_DENIED, NULL, GFP_KERNEL,
+			return aa_audit(AUDIT_APPARMOR_DENIED,
+					__aa_current_profile(), GFP_KERNEL,
 					&sa, NULL);
 		}
 	} else if (strcmp(name, "exec") == 0) {