apparmor: Fix aa_label_build() error handling for failed merges
authorJohn Johansen <john.johansen@canonical.com>
Thu, 24 Jan 2019 21:53:05 +0000 (13:53 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Mar 2019 21:02:32 +0000 (14:02 -0700)
commitd7807b62276efdb49d9ade2af39fcc409c568f7b
tree7c92fc419f51eb7f2e9a0b34e4760b8faaf96152
parentd92d3caf818dd9b78bdbef179d68647305a01678
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