Revert "UBUNTU: SAUCE: apparmor Fix: refcount bug in pivotroot mediation"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 2c30f8bde8c7986abcd2d18b4fa21565eede7dca.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

security/apparmor/include/context.h

@@ -162,8 +162,6 @@ static inline void aa_end_current_label(struct aa_label *label)
  *   just return the up to date label
  *
  * The returned reference must be put with aa_end_current_label()
- * This must NOT be used if the task cred could be updated within the
- * critical section between aa_begin_current_label() .. aa_end_current_label()
  */
 static inline struct aa_label *aa_begin_current_label(bool update)
 {

security/apparmor/lsm.c

@@ -580,10 +580,10 @@ static int apparmor_sb_pivotroot(struct path *old_path, struct path *new_path)
 	struct aa_label *label;
 	int error = 0;
 
-	label = aa_get_current_label();
+	label = aa_begin_current_label(NO_UPDATE);
 	if (!unconfined(label))
 		error = aa_pivotroot(label, old_path, new_path);
-	aa_put_label(label);
+	aa_end_current_label(label);
 
 	return error;
 }