From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D07FDC43381 for ; Sat, 23 Feb 2019 21:09:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84FE92085A for ; Sat, 23 Feb 2019 21:09:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550956178; bh=As7jo/wDN4MQQnrRe4af41siS39wE+PSEtqZl6MG9Zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dbcvmCRER+U1xgSqbPTMoCkYqM2C+3TCkcCZbNOMuxM6jM0S1/RCfzPkfjpFkisWX bYA8m98m2HnMMlCyKVg3V+4XNt35T8eWSeOJlVA8Mnl2yjjMWikrLqQOehMjb+E7ZT 5QpSRg127cxEJvxbsRtbK8Zs5pleTLyWW+p3K45E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729572AbfBWVJg (ORCPT ); Sat, 23 Feb 2019 16:09:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:45222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729217AbfBWVJd (ORCPT ); Sat, 23 Feb 2019 16:09:33 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E68D12085A; Sat, 23 Feb 2019 21:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550956172; bh=As7jo/wDN4MQQnrRe4af41siS39wE+PSEtqZl6MG9Zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hQAggGkhfZSYcvxW5PS967QepDx+Ixs6dl9vfiNkCkpAUjxMt5gRQ/a4kZ7Tf/xPW 6t7xqWFP0ergRL2ejghz0aDm33tGxr4mB/ghVZ2TdLHzI+cmuM37qm5ODdCCspXx4G Y0One5OHhQz2EUkdQeBsbHkT80CMrOiDtGVkLwto= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Johansen , Sasha Levin , linux-security-module@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 37/45] apparmor: Fix aa_label_build() error handling for failed merges Date: Sat, 23 Feb 2019 16:08:27 -0500 Message-Id: <20190223210835.201708-37-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190223210835.201708-1-sashal@kernel.org> References: <20190223210835.201708-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Johansen [ 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 Signed-off-by: John Johansen Signed-off-by: Sasha Levin --- security/apparmor/domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index dd754b7850a82..67bf8b7ee8a28 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c @@ -1260,7 +1260,10 @@ int aa_change_profile(const char *fqname, int flags) aa_get_label(&profile->label)); if (IS_ERR_OR_NULL(new)) { info = "failed to build target label"; - error = PTR_ERR(new); + if (!new) + error = -ENOMEM; + else + error = PTR_ERR(new); new = NULL; perms.allow = 0; goto audit; -- 2.19.1