From patchwork Tue Mar 1 19:30:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 1600109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=foxmail.com header.i=@foxmail.com header.a=rsa-sha256 header.s=s201512 header.b=SVWU0b1P; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K87fK11dfz9sFq for ; Thu, 3 Mar 2022 09:12:57 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4K87fJ0j4xz3bsr for ; Thu, 3 Mar 2022 09:12:56 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=foxmail.com header.i=@foxmail.com header.a=rsa-sha256 header.s=s201512 header.b=SVWU0b1P; dkim-atps=neutral X-Original-To: linux-aspeed@lists.ozlabs.org Delivered-To: linux-aspeed@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=foxmail.com (client-ip=203.205.221.190; helo=out203-205-221-190.mail.qq.com; envelope-from=liwg06@foxmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=foxmail.com header.i=@foxmail.com header.a=rsa-sha256 header.s=s201512 header.b=SVWU0b1P; dkim-atps=neutral X-Greylist: delayed 750 seconds by postgrey-1.36 at boromir; Wed, 02 Mar 2022 06:47:19 AEDT Received: from out203-205-221-190.mail.qq.com (out203-205-221-190.mail.qq.com [203.205.221.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4K7SSl4qqzz30FR for ; Wed, 2 Mar 2022 06:47:07 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1646164023; bh=Sb3UcYOkMwOiM+FMVEB/7Mf7e9YvGkIfq21PpjOlOTk=; h=From:To:Cc:Subject:Date; b=SVWU0b1PvJ6PKaqcgCCM4TRIqwdEURunrG/LHh07vv48+4osoxxIGyaSsRHHVfqSk 3i9j89/rIiEcrqT2kniLkvW5FBYNYO3EwDm9FYcBLrVSUFFvHurxzrx0rlQ/Kq3c8O Y7iQ6k20LA02c5nF8GIqzahPj7lECtHPEgCH+nRg= Received: from localhost.localdomain ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id 7B723608; Wed, 02 Mar 2022 03:30:55 +0800 X-QQ-mid: xmsmtpt1646163055thmxsx56i Message-ID: X-QQ-XMAILINFO: OfkeHAqGKDFb5pL06KT/dpe47k17PjLJZMgf74ZkiIng4U5qmNF3u9ILDSUGp0 FkDOYIPRpsZp4waZ4HM7CRHkoEq5qzjZHsZp4j3bskvhlOPyGONFY842xLSDUvROd85nXkPjWngd uiqZr9bnP1ZBu4HU250UjY8YU1W9XgC7iWv9n6KWENSpshHAPc3R0Z0Zrm+0DjFAh4FBF+upC5Gc 6osoqxkqHI9MpZErVDjXLjWux6yCH6+ijtjdS2rzREp0hA+nrpWhzLBmyAkIZRS5xqyAr7LxOm1S 5FgcnXrIbI2hdP56ruslHwmafNtdilyKSs0OSEt/LJApoGRhRpdGBO/dkUJm0vk6c/zHJFpQL2h/ k/TWHFxYxttR+LlmLjDBtTfLwfwlwpJldb2OBwU4/WaW3JiKz7B2EljRAN1BvAf1IhKMfC8Evkyw CjY40zGo6FUPgQN7w0QRdIkuOT0Ka5JV12woVmukk1UvcrmQY2D5MeF4yypZGgUbFuLFJF49Yik6 nalhj8DVFpTgpaOlejm1EnZKqG40qz2nRyOteKcr9g7YcuD2fLQSoFmoEROx0kC6DswkDB2G//U1 6Z10NRy4HhEHJBbNOyCpHwnn0Ad4b59S9zcPOYcIrqWHXnuF8AZvFlzar1QuKJm14FIEeK4y7Zzb Y5D1Zr2V3qCxIA7Cs/phY9vglWOXCzLueEB2GvYjDLOfjLRjaVXv2l7TDfu5tB+GeP8TMRkUn0p+ sWUY6rl4/TXy+ozNLe0j55Mr4IouT/ZdUoR5jESVh3zELXOopZKlEfMwlf+kv+YjzF6uCvgIjm15 x53jgArbIZZ9vItIshx7c9S1vhye+e4vg4yh02JNberywwMNeoaTYOs8UvNS5XKLVYrWhpPo8hnW XxruDdXXqf0s6MM/lIKdUflgV88YQ0dZNLjECx7Tgy From: Weiguo Li To: andrew@aj.id.au Subject: [PATCH] pinctrl: aspeed: fix null dereference in debug Date: Wed, 2 Mar 2022 03:30:54 +0800 X-OQ-MSGID: <20220301193054.503419-1-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 03 Mar 2022 09:11:13 +1100 X-BeenThere: linux-aspeed@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux ASPEED SoC development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-gpio@vger.kernel.org, linux-aspeed@lists.ozlabs.org Errors-To: linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linux-aspeed" "pdesc" is null checked, but already dereferenced ahead in debug. Swap their positions to avoid potential null dereference. Signed-off-by: Weiguo Li Reviewed-by: Petr Vorel --- 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)