|
@@ -142,6 +142,7 @@ int apparmor_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
|
|
|
{
|
|
|
/* TODO: cache secctx and ref count so we don't have to recreate */
|
|
|
struct aa_label *label = aa_secid_to_label(secid);
|
|
|
+ int len;
|
|
|
|
|
|
AA_BUG(!secdata);
|
|
|
AA_BUG(!seclen);
|
|
@@ -150,18 +151,19 @@ int apparmor_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
|
|
|
return -EINVAL;
|
|
|
|
|
|
if (secdata)
|
|
|
- *seclen = aa_label_asxprint(secdata, root_ns, label,
|
|
|
- FLAG_SHOW_MODE | FLAG_VIEW_SUBNS |
|
|
|
- FLAG_HIDDEN_UNCONFINED |
|
|
|
- FLAG_ABS_ROOT, GFP_ATOMIC);
|
|
|
+ len = aa_label_asxprint(secdata, root_ns, label,
|
|
|
+ FLAG_SHOW_MODE | FLAG_VIEW_SUBNS |
|
|
|
+ FLAG_HIDDEN_UNCONFINED | FLAG_ABS_ROOT,
|
|
|
+ GFP_ATOMIC);
|
|
|
else
|
|
|
- *seclen = aa_label_snxprint(NULL, 0, root_ns, label,
|
|
|
- FLAG_SHOW_MODE | FLAG_VIEW_SUBNS |
|
|
|
- FLAG_HIDDEN_UNCONFINED |
|
|
|
- FLAG_ABS_ROOT);
|
|
|
- if (*seclen < 0)
|
|
|
+ len = aa_label_snxprint(NULL, 0, root_ns, label,
|
|
|
+ FLAG_SHOW_MODE | FLAG_VIEW_SUBNS |
|
|
|
+ FLAG_HIDDEN_UNCONFINED | FLAG_ABS_ROOT);
|
|
|
+ if (len < 0)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
+ *seclen = len;
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|