diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2019-04-25 18:17:44 +0200 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2019-04-25 18:17:44 +0200 |
commit | 9d9ea7dde2646ba8e36037e2679f2d98080df36b (patch) | |
tree | fdcbb9a89f3b97e14242524449bf98faba4d4e34 /security/apparmor/domain.c | |
parent | 6b8816d9e21df6b1d543c49428eba01b00e4ea1c (diff) | |
parent | c0ad257a19f48c56f2ee2e623a78251aa8664279 (diff) |
Merge tag 'v4.20.17' into toradex_4.20.y
This is the 4.20.17 stable release
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: new = aa_label_merge(label, target, GFP_KERNEL); if (IS_ERR_OR_NULL(new)) { info = "failed to build target label"; - error = PTR_ERR(new); + if (!new) + error = -ENOMEM; + else + error = PTR_ERR(new); new = NULL; perms.allow = 0; goto audit; |