| From e86f350e2f3ce09bf77655d83f9231a48be93068 Mon Sep 17 00:00:00 2001 |
| From: John Johansen <john.johansen@canonical.com> |
| Date: Thu, 24 Jan 2019 13:53:05 -0800 |
| Subject: apparmor: Fix aa_label_build() error handling for failed merges |
| |
| [ Upstream commit d6d478aee003e19ef90321176552a8ad2929a47f ] |
| |
| aa_label_merge() can return NULL for memory allocations failures |
| make sure to handle and set the correct error in this case. |
| |
| Reported-by: Peng Hao <peng.hao2@zte.com.cn> |
| Signed-off-by: John Johansen <john.johansen@canonical.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| security/apparmor/domain.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| 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 @@ int aa_change_profile(const char *fqname, int flags) |
| 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; |
| -- |
| 2.19.1 |
| |
