]> git.baikalelectronics.ru Git - 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)
committerJohn Johansen <john.johansen@canonical.com>
Fri, 1 Feb 2019 16:01:39 +0000 (08:01 -0800)
commit5f25d82130630b9c734e8debea5543c65dc88477
tree83b0a5146107db7c386670e32721a5fb9cc15446
parentf0ae28a031ee44f8ed390e6c8d499737a500a7f9
apparmor: Fix aa_label_build() error handling for failed merges

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>
security/apparmor/domain.c