]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
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)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
commit08b836c1f7dd0281e90ee00b34803d2d00c17850
tree6b3804a24b8ef6953d60dd7caf4987d183df6d52
parente4275ba8a91b2f55ea58e773a3b4bf3649c91b2d
apparmor: Fix aa_label_build() error handling for failed merges

BugLink: https://bugs.launchpad.net/bugs/1837813
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
security/apparmor/domain.c