diff options
| author | John Johansen <john.johansen@canonical.com> | 2019-01-25 00:53:05 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-14 00:03:16 +0300 |
| commit | 865c798a37bfacafd35e6c0f2d5d5e5bb572a07d (patch) | |
| tree | e50ee6a7a4855236134a0ef317b1a3886c5fd6b2 /security | |
| parent | c72b4dcd26795d6941db0cedd2c2212bb9b32d2f (diff) | |
| download | linux-865c798a37bfacafd35e6c0f2d5d5e5bb572a07d.tar.xz | |
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>
Diffstat (limited to 'security')
| -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 dd754b7850a8..67bf8b7ee8a2 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c @@ -1260,7 +1260,10 @@ check: aa_get_label(&profile->label)); 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; |