From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-by2nam03on0135.outbound.protection.outlook.com ([104.47.42.135]:56386 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727338AbeH3WFD (ORCPT ); Thu, 30 Aug 2018 18:05:03 -0400 From: Sasha Levin To: "stable@vger.kernel.org" CC: Dan Carpenter , John Johansen , Sasha Levin Subject: [PATCH AUTOSEL 4.18 017/113] apparmor: fix an error code in __aa_create_ns() Date: Thu, 30 Aug 2018 18:01:42 +0000 Message-ID: <20180830180050.35735-17-alexander.levin@microsoft.com> References: <20180830180050.35735-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180050.35735-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Dan Carpenter [ Upstream commit 0a6b29230ec336189bab32498df3f06c8a6944d8 ] We should return error pointers in this function. Returning NULL results in a NULL dereference in the caller. Fixes: 73688d1ed0b8 ("apparmor: refactor prepare_ns() and make usable from = different views") Signed-off-by: Dan Carpenter Signed-off-by: John Johansen Signed-off-by: Sasha Levin --- security/apparmor/policy_ns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/apparmor/policy_ns.c b/security/apparmor/policy_ns.c index b0f9dc3f765a..1a7cec5d9cac 100644 --- a/security/apparmor/policy_ns.c +++ b/security/apparmor/policy_ns.c @@ -255,7 +255,7 @@ static struct aa_ns *__aa_create_ns(struct aa_ns *paren= t, const char *name, =20 ns =3D alloc_ns(parent->base.hname, name); if (!ns) - return NULL; + return ERR_PTR(-ENOMEM); ns->level =3D parent->level + 1; mutex_lock_nested(&ns->lock, ns->level); error =3D __aafs_ns_mkdir(ns, ns_subns_dir(parent), name, dir); --=20 2.17.1