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>
This commit is contained in:
parent
a1a02062ad
commit
d6d478aee0
|
@ -1444,6 +1444,9 @@ check:
|
||||||
new = aa_label_merge(label, target, GFP_KERNEL);
|
new = aa_label_merge(label, target, GFP_KERNEL);
|
||||||
if (IS_ERR_OR_NULL(new)) {
|
if (IS_ERR_OR_NULL(new)) {
|
||||||
info = "failed to build target label";
|
info = "failed to build target label";
|
||||||
|
if (!new)
|
||||||
|
error = -ENOMEM;
|
||||||
|
else
|
||||||
error = PTR_ERR(new);
|
error = PTR_ERR(new);
|
||||||
new = NULL;
|
new = NULL;
|
||||||
perms.allow = 0;
|
perms.allow = 0;
|
||||||
|
|
Loading…
Reference in New Issue