| commit | d7807b62276efdb49d9ade2af39fcc409c568f7b | [log] [tgz] |
|---|---|---|
| author | John Johansen <john.johansen@canonical.com> | Thu Jan 24 13:53:05 2019 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Mar 13 14:02:32 2019 -0700 |
| tree | 7c92fc419f51eb7f2e9a0b34e4760b8faaf96152 | |
| parent | d92d3caf818dd9b78bdbef179d68647305a01678 [diff] |
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>