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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 5FB53C433E0 for ; Thu, 18 Jun 2020 01:26:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 36D7021D7A for ; Thu, 18 Jun 2020 01:26:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443608; bh=uh6GsbfS4l9MlGVR22Er0j3y6GjYjhcwng1zRCyEd2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aiG8Nkc55I7Pd4SrehLIi/kdIfJb8JhFt/CDhXN5h4PmjnoZya0VHqP9Q7FuL6kIJ h3hQWDAs9/rm52Bo5R7BrEBNkFi58JLi9j8AFZlkXmNUY5SF1kKwoLzrnqlaEVwn72 ozg8nevNakloPoqX43eTVK8NEh3pCUq1kUZ3A3aQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730758AbgFRB0p (ORCPT ); Wed, 17 Jun 2020 21:26:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:57078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730501AbgFRBX2 (ORCPT ); Wed, 17 Jun 2020 21:23:28 -0400 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 9245021927; Thu, 18 Jun 2020 01:23:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443408; bh=uh6GsbfS4l9MlGVR22Er0j3y6GjYjhcwng1zRCyEd2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lP47wv7QiPUZXjmm3bY20RUrgU4bkOvYB/4+9ISKlEh3lrPZSl0RE+KLuxvJGhZFm UfZV0Ui5dy4WspqUxKl0BYaijk3VxSlpeIKZBh7i+IG2P0tHW93ZWKpi87hMUMp4ZF 5TpzUV2vJXojDAvHF9UBvWPJh7Ba91gx3MmSjb+o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chen Zhou , Rui Miguel Silva , Greg Kroah-Hartman , Sasha Levin , greybus-dev@lists.linaro.org, devel@driverdev.osuosl.org Subject: [PATCH AUTOSEL 4.19 052/172] staging: greybus: fix a missing-check bug in gb_lights_light_config() Date: Wed, 17 Jun 2020 21:20:18 -0400 Message-Id: <20200618012218.607130-52-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012218.607130-1-sashal@kernel.org> References: <20200618012218.607130-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Chen Zhou [ Upstream commit 9bb086e5ba9495ac150fbbcc5c8c2bccc06261dd ] In gb_lights_light_config(), 'light->name' is allocated by kstrndup(). It returns NULL when fails, add check for it. Signed-off-by: Chen Zhou Acked-by: Rui Miguel Silva Link: https://lore.kernel.org/r/20200401030017.100274-1-chenzhou10@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/greybus/light.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index 40680eaf3974..db06cd544af5 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -1028,7 +1028,8 @@ static int gb_lights_light_config(struct gb_lights *glights, u8 id) light->channels_count = conf.channel_count; light->name = kstrndup(conf.name, NAMES_MAX, GFP_KERNEL); - + if (!light->name) + return -ENOMEM; light->channels = kcalloc(light->channels_count, sizeof(struct gb_channel), GFP_KERNEL); if (!light->channels) -- 2.25.1