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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 61EB6C2BD09 for ; Wed, 4 Dec 2019 18:15:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26858205ED for ; Wed, 4 Dec 2019 18:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483355; bh=e6qGQRIZrtXDgznxd/sfbmBkFUaX/3tahaTY56rdRTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NmcDd3yCGz0v8/uh4RcdIb/b828ADm0u69dP4XU7T4TjM4E4sZj3lzcYdWjrS5bJP pWt9QmVZVgP/m3BeLTkq8myRso4tx3wqUXQcvNNELYMaW5DEBvv9hC6F97T5hL3d1z aXuJJd0TNu/lPhGzM4j+9tiKhZ7curA4rQhtg3t4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731822AbfLDSNt (ORCPT ); Wed, 4 Dec 2019 13:13:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:42956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731809AbfLDSNo (ORCPT ); Wed, 4 Dec 2019 13:13:44 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0419920674; Wed, 4 Dec 2019 18:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483224; bh=e6qGQRIZrtXDgznxd/sfbmBkFUaX/3tahaTY56rdRTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GoFh5tFk6GhNQZkMwwNCUeCDSCBp0qgTp1E4sRcjU8qDaXbUi8UDduLUVANYS2ggL w3t2Q1pCR9CoPfTBVad5b07B0n5autalyvbSRcCWbMIXglOZjyHztuExgbm+0ZHKWs onanJ5xiZM99PDn24cTYktkJY6HtpQreaWaIP5kY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gen Zhang , Michael Ellerman , Sasha Levin Subject: [PATCH 4.9 103/125] powerpc/pseries/dlpar: Fix a missing check in dlpar_parse_cc_property() Date: Wed, 4 Dec 2019 18:56:48 +0100 Message-Id: <20191204175325.382084454@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175308.377746305@linuxfoundation.org> References: <20191204175308.377746305@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gen Zhang [ Upstream commit efa9ace68e487ddd29c2b4d6dd23242158f1f607 ] In dlpar_parse_cc_property(), 'prop->name' is allocated by kstrdup(). kstrdup() may return NULL, so it should be checked and handle error. And prop should be freed if 'prop->name' is NULL. Signed-off-by: Gen Zhang Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/platforms/pseries/dlpar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index 999b04819d699..5abb8e2239a54 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c @@ -63,6 +63,10 @@ static struct property *dlpar_parse_cc_property(struct cc_workarea *ccwa) name = (char *)ccwa + be32_to_cpu(ccwa->name_offset); prop->name = kstrdup(name, GFP_KERNEL); + if (!prop->name) { + dlpar_free_cc_property(prop); + return NULL; + } prop->length = be32_to_cpu(ccwa->prop_length); value = (char *)ccwa + be32_to_cpu(ccwa->prop_offset); -- 2.20.1