From patchwork Tue Oct 27 13:50:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312574 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, 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 483ADC63699 for ; Tue, 27 Oct 2020 15:43:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E9C1C22265 for ; Tue, 27 Oct 2020 15:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813403; bh=4FSHkyGDEJlMRqOcMyHyaYqZjUMU1xhbCf15M4ZTGDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nOXrozam+3EoZgX4/MDrqgtfrKEBGEX8PiLJ1/CeJZ4e1W8/6yKBeDNEvMSqDtHnd a1sXBTWF4u3x1vjfMpqg/T5QfJJgEyzujWfr8kZe/ZsOJzbonDPrU6KGOZDJna6wZE 99cUGXLFc8oFuPhxv4TykZhVpiGEOEJnozcxNBpE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1799978AbgJ0Pe1 (ORCPT ); Tue, 27 Oct 2020 11:34:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:52592 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1799975AbgJ0Pe0 (ORCPT ); Tue, 27 Oct 2020 11:34:26 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 7148522264; Tue, 27 Oct 2020 15:34:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812866; bh=4FSHkyGDEJlMRqOcMyHyaYqZjUMU1xhbCf15M4ZTGDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=erSgs80ILdWPoEf53IGdLkJUIfAHedG0IKMDVhJHQvUBXiMWk1+R6N7UkwnfhqH4w uqu2UEqt7i+r8qSLVKNVi2P7MEH9cRAI32ToGRzGNjugi2nAStUtrhimvIfUCkkdUq smKOP8+K8NHezRRSW5o0BBeE767mpgXpuyC8d7P8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trent Piepho , Drew Fustini , Tony Lindgren , Linus Walleij , Sasha Levin Subject: [PATCH 5.9 358/757] pinctrl: single: fix pinctrl_spec.args_count bounds check Date: Tue, 27 Oct 2020 14:50:08 +0100 Message-Id: <20201027135507.363475967@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Drew Fustini [ Upstream commit 9b9448f39e83d8e6fdfed006c5db8c304a98c2cd ] The property #pinctrl-cells can either be 1 or 2: - if #pinctrl-cells = <1>, then pinctrl_spec.args_count = 2 - if #pinctrl-cells = <2>, then pinctrl_spec.args_count = 3 All other values of pinctrl_spec.args_count are incorrect. This fix checks the upper bound instead of just the lower bound. Fixes: a13395418888 ("pinctrl: single: parse #pinctrl-cells = 2") Reported-by: Trent Piepho Signed-off-by: Drew Fustini Acked-by: Tony Lindgren Link: https://lore.kernel.org/linux-omap/3139716.CMS8C0sQ7x@zen.local/ Link: https://lore.kernel.org/r/20200930174839.1308344-1-drew@beagleboard.org Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/pinctrl-single.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index efe41abc5d472..5cbf0e55087c6 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1014,7 +1014,7 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs, if (res) return res; - if (pinctrl_spec.args_count < 2) { + if (pinctrl_spec.args_count < 2 || pinctrl_spec.args_count > 3) { dev_err(pcs->dev, "invalid args_count for spec: %i\n", pinctrl_spec.args_count); break;