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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E1C74C43334 for ; Thu, 14 Jul 2022 05:01:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2CJJDQ0RSo+nNW53Q4qhx9VGqTvk2CI/cPd7XZZWrxI=; b=WkErVmeuCToS0H lpWBzJwUoMgs4gVlQqMVvq6+9KoOyxEAlUra5pKuRfTa4SyjDwIpJJ/qBPH8AfgI6oyVVHaQWZxy6 Iul/erfWHu6aNoY8SsLndzHqXgTdtYYyd7QxirCRol1cF69woqGZVt9oU83BUJSrINBBImFO4vmr6 +SMMmislzRElJ7V9UgOjy2QC+5VBKZhWr+GxoYT65d5+z3lftCv7mz+aAnbBqqnpRQdXCpXNlVjc0 MbgjimdKG3h2Vile1CGZBClZ2wgD/ic/ow5RANAgkksJd4+WM7T/jdIkCAf9yTpJhdq5q07xG9uFA mGTb4zOyIRhpv9Y8eZ0A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBqxQ-00AsTH-0v; Thu, 14 Jul 2022 05:00:12 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBqwe-00Arxx-9G for linux-arm-kernel@bombadil.infradead.org; Thu, 14 Jul 2022 04:59:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=gmYeuJJs4ignRivJtRAN2E/BvfQmj5aGRyiMgexDE8g=; b=pou9cY9jBew9RKi3ad4Vu4WE9J JCjGEpNmSTU5gABkwZKcIV28/di+HTWegLw0YJuirHFIBmsIxiv+5ctc+6XxuL9rEgdxc7iZHTyMJ 90qxQ1KgMSdLhfyNzELQz6HNcoozn88YvOsmLzWZi3SLdxiFfDf5DQw3Nl2z+Rdpd99zrCvW0GkHb JxanjtLMWjrz7m9P31DHmCEzOvBcjUXJzLmbXC3KmA7rhubjq4CehHWErQNgLEScG9/K3H4O9dx9d mQVCpJTRYXZpSAftvTUE65qjphxkulqtrBw7YHuDdPbNjtuJc2QkyW+VL5OlyI4L2T/UGmstYrN0j ExPkwwyw==; Received: from dfw.source.kernel.org ([139.178.84.217]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBqP0-003kDI-V0 for linux-arm-kernel@lists.infradead.org; Thu, 14 Jul 2022 04:24:41 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 49AE661E51; Thu, 14 Jul 2022 04:24:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFE9FC341C8; Thu, 14 Jul 2022 04:24:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657772673; bh=I/S6MXKj+pJExOorvIiThOlDOL37GW0RHtgnBej/vcs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X8P3M3uEnLgnWojff1dqZv95K4Lvj0sabfbXK0e21g/yt3sZTKz1ZKJv1G5n3Uq4Z qC0otvc3t3h+gfNATeG1zUh1IRjZvkWDEirtR6/y87KMfuSYMcMU36pvFZCHoM3qaL 0fEBAmJmvoPRFQT1yx1WrXMdCEygKLFQCrsJuDTRWK8xh4YJ3pQKb4GCEUbwFaiYZM gW4//YvRhlukpXNoMNY0eSvG8qu+Dkz7NOjCBYhFN4bclmd6nds+dSzMuTTs5CNI9t Wj4vZ38cvkgzRiujy0FEGj2OQKt+t77rfN1obatupTAC9zmHGJb0yXJfMmrzXDPkP3 WIZoDjLYVSvsQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Haowen Bai , Linus Walleij , Sasha Levin , andrew@aj.id.au, joel@jms.id.au, linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 02/28] pinctrl: aspeed: Fix potential NULL dereference in aspeed_pinmux_set_mux() Date: Thu, 14 Jul 2022 00:24:03 -0400 Message-Id: <20220714042429.281816-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220714042429.281816-1-sashal@kernel.org> References: <20220714042429.281816-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220714_052439_253190_E978162A X-CRM114-Status: GOOD ( 13.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Haowen Bai [ Upstream commit 84a85d3fef2e75b1fe9fc2af6f5267122555a1ed ] pdesc could be null but still dereference pdesc->name and it will lead to a null pointer access. So we move a null check before dereference. Signed-off-by: Haowen Bai Link: https://lore.kernel.org/r/1650508019-22554-1-git-send-email-baihaowen@meizu.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c index c94e24aadf92..83d47ff1cea8 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c @@ -236,11 +236,11 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function, const struct aspeed_sig_expr **funcs; const struct aspeed_sig_expr ***prios; - pr_debug("Muxing pin %s for %s\n", pdesc->name, pfunc->name); - if (!pdesc) return -EINVAL; + pr_debug("Muxing pin %s for %s\n", pdesc->name, pfunc->name); + prios = pdesc->prios; if (!prios) -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel