UBUNTU: SAUCE: apparmor: Fix: label_vec_merge insertion

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

label_vec_merge should only do the insertion after the vector is copied.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

security/apparmor/label.c

@@ -1160,11 +1160,11 @@ struct aa_label *aa_label_vec_merge(struct aa_profile **vec, int len,
 	if (!new)
 		return NULL;
 
-	write_lock_irqsave(&ls->lock, flags);
 	for (i = 0; i < len; i++) {
 		new->ent[i] = aa_get_profile(vec[i]);
-		label = __aa_label_insert(ls, new, false);
 	}
+	write_lock_irqsave(&ls->lock, flags);
+	label = __aa_label_insert(ls, new, false);
 	write_unlock_irqrestore(&ls->lock, flags);
 	if (label != new)
 		/* not fully constructed don't put */