diff options
Diffstat (limited to 'security/apparmor/domain.c')
| -rw-r--r-- | security/apparmor/domain.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index 08c88de0ffda..11975ec8d566 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c | |||
| @@ -1444,7 +1444,10 @@ check: | |||
| 1444 | new = aa_label_merge(label, target, GFP_KERNEL); | 1444 | new = aa_label_merge(label, target, GFP_KERNEL); |
| 1445 | if (IS_ERR_OR_NULL(new)) { | 1445 | if (IS_ERR_OR_NULL(new)) { |
| 1446 | info = "failed to build target label"; | 1446 | info = "failed to build target label"; |
| 1447 | error = PTR_ERR(new); | 1447 | if (!new) |
| 1448 | error = -ENOMEM; | ||
| 1449 | else | ||
| 1450 | error = PTR_ERR(new); | ||
| 1448 | new = NULL; | 1451 | new = NULL; |
| 1449 | perms.allow = 0; | 1452 | perms.allow = 0; |
| 1450 | goto audit; | 1453 | goto audit; |
