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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 2B644C282CE for ; Mon, 11 Feb 2019 14:30:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F05F820838 for ; Mon, 11 Feb 2019 14:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895412; bh=aWHigvl4q892npeZOKRLcjzUYZhu9wfb9HiXXs9K6ME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eJLQ25e+FaSDJUaCroPDOFSRLhcwqEPUKCYfdvNhnu5sMNAxz7YxeoPJ/Mn16Uwj4 xcC9yPw6LUwSvfEu4Jc1QcTbsyIaMDsEDE862LncaZsUwXvSs2K7eAvrwjvCuQNoQx rrhy56p+taH6xWf7LfaLTOPw1UY4v3Xcn5bfnamQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730084AbfBKOaK (ORCPT ); Mon, 11 Feb 2019 09:30:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:36424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727691AbfBKOaG (ORCPT ); Mon, 11 Feb 2019 09:30:06 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 BDD422075C; Mon, 11 Feb 2019 14:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895406; bh=aWHigvl4q892npeZOKRLcjzUYZhu9wfb9HiXXs9K6ME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QsRYQYrvGIvoQfB2gIInBrMms38WVIjtvLAv5jQ6u/+p5EjEF4kqBo0j6TOQMIHfj WzNLA0oJOwcjwZyT6tLp7uPJIPsqtP3aJmuVWq0jPMcGMXdOS9PfeEkv27iNbfn7PM tjtapPW4976w3GAuLHhtDzAXg6O7113uiaO3EJHk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Mc Guire , Geert Uytterhoeven , Sasha Levin Subject: [PATCH 4.20 195/352] pinctrl: rza1: Handle devm_kasprintf() failure cases Date: Mon, 11 Feb 2019 15:17:02 +0100 Message-Id: <20190211141859.544769780@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit db221412cd2014506642967155698825ad80f6b6 ] devm_kasprintf() may return NULL on failure of internal allocation thus the assignments are not safe if not checked. On error rza1_pinctrl_register() respectively rza1_parse_gpiochip() return negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here. Signed-off-by: Nicholas Mc Guire Fixes: 5a49b644b307 ("pinctrl: Renesas RZ/A1 pin and gpio controller") Signed-off-by: Geert Uytterhoeven Signed-off-by: Sasha Levin --- drivers/pinctrl/pinctrl-rza1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/pinctrl-rza1.c index 14eb576c04a2..9cfe9d0520ac 100644 --- a/drivers/pinctrl/pinctrl-rza1.c +++ b/drivers/pinctrl/pinctrl-rza1.c @@ -1225,6 +1225,9 @@ static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl, chip->base = -1; chip->label = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%pOFn", np); + if (!chip->label) + return -ENOMEM; + chip->ngpio = of_args.args[2]; chip->of_node = np; chip->parent = rza1_pctl->dev; @@ -1326,6 +1329,8 @@ static int rza1_pinctrl_register(struct rza1_pinctrl *rza1_pctl) pins[i].number = i; pins[i].name = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "P%u-%u", port, pin); + if (!pins[i].name) + return -ENOMEM; if (i % RZA1_PINS_PER_PORT == 0) { /* -- 2.19.1