Revert "UBUNTU: SAUCE: apparmor: Fix: refcount leak in aa_label_merge"

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

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

security/apparmor/label.c

@@ -1099,7 +1099,7 @@ struct aa_label *aa_label_merge(struct aa_label *a, struct aa_label *b,
 		 */
 		new = aa_label_alloc(a->size + b->size, gfp);
 		if (!new)
-			goto out;
+			return NULL;
 
 		write_lock_irqsave(&ls->lock, flags);
 		label = __label_merge_insert(ls, new, a, b);
@@ -1110,7 +1110,6 @@ struct aa_label *aa_label_merge(struct aa_label *a, struct aa_label *b,
 			new = NULL;
 		}
 		aa_put_label(new);
-	out:
 		aa_put_label(a);
 		aa_put_label(b);
 	}