From patchwork Sun Sep 13 23:15:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 11772535 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A6B7E746 for ; Sun, 13 Sep 2020 23:19:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 67C2A21BE5 for ; Sun, 13 Sep 2020 23:19:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="njf8hfql"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=beagleboard-org.20150623.gappssmtp.com header.i=@beagleboard-org.20150623.gappssmtp.com header.b="gxOQysRu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67C2A21BE5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=beagleboard.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=XTFkw18PjUS1R9mIj7l79jg0Ps0Pf2X1OtjHmizxJA4=; b=njf8hfqluFCgheI0+CLCJ9Yu08 h9kbg9iR3SMhBk3qyaqA3vfXJhaENkmxhXSW55AYeQA8hwHoe8dzqNOyDJFn5JQ9YFnqx2F6lPKYN iArgsAWOMWgBvVbKvEoHN7Z0uMriurgpK0vD44QZ/Lxq9TXKyszQ6WyBEQWLK8AHH7es3YCOvOSYw fP8Sc4vuYuwA/hsWmIcDXyc2Y3bU1XEigo2hne16UhIAHzdsYBHNGULd5BMraoFUdb0I9F3SpDm/9 EqGPWZrhG6fDLa9EXBZyxNCxoWXLvdyeIJRjB4PnA/pkEfaMZy0Moc5AwF8Olw+ZTsDbDyg5BHHuu ByCS0sfQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHbGD-00059Q-F9; Sun, 13 Sep 2020 23:18:17 +0000 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHbGA-00058y-Sc for linux-arm-kernel@lists.infradead.org; Sun, 13 Sep 2020 23:18:15 +0000 Received: by mail-ed1-x544.google.com with SMTP id c8so15802813edv.5 for ; Sun, 13 Sep 2020 16:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=beagleboard-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bWJY75AyULAxhQ0F3nLmzgFjwjfgQt1Qe/zoTX8XTmU=; b=gxOQysRutB8dPQHtSZKO0bqxRRznZVqn8tzuK0knwge0RgxsAuKhsF3Da83Z4e5bY+ wmW6+Fl+1teyScO+Z9mUqBU6jPaCLg7Ay5k0IemYJoU6OvtbV/JPL5GbRcsTt6fv4aXz Ka/pIEqvw+H8oB4oIdhree9vuXMsfTypYfXdBsugmcj4NXQBC2J/2w3KH/7AcNRbSjoX zK+xycCg7ctZLlPSymnbooUkfflPRce7j2iDiemY6pEoedAzpx5EI7F4LszA1oAtUAdx 1CyBzqmNYL9/HEmmumtzcotll0mhMmtN+rztzdOqwLK35ebdyhnlBJKzKna/b+dJrPSq nyLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bWJY75AyULAxhQ0F3nLmzgFjwjfgQt1Qe/zoTX8XTmU=; b=gCWETdGGKJVNM69f6eA37CCktLeZcXISiw69r4gZKxBBqump39ODcRAgevByZzmyKz yKrRO6b5BSfdpcJZ2msm3T4e/sx2lkk4mg7aOryewUD9VNWCWvhXMyoTEB+3AQoM9vUD WS63HpEPuX6ntDGx0/xrvx41HX2yjh4AA7U5BCWY1TtGQ4mWagVvwmfUk9o8UJxkP1fF z5ftDiyaqrICnkLq3rwHZOPifyXUr5n1z4KzBbwLcyQLQ9K7v3sEIdt8Fx4idFN3xtX3 Ivcx5X2Da6Xbc7HMOjJsgXArTNQZ735yvYszCwKWIb0rp54Eb8M0h80xabd0MwSlSjZC 93nw== X-Gm-Message-State: AOAM531GH8SI0MvHh2tzCYWK9gKxjmy3AvurBiu5E7IObX5men9VREy8 rNtcjYpOdFdzE9rGsJJHDmjs3KqgDYdg73Xin04= X-Google-Smtp-Source: ABdhPJyUpwWpjLuf78P5AvMtzIATLK3+4O53dXN2yVEul/Z4MFq/v2FHZkqRSXRJFfwlh1YFTPeH8g== X-Received: by 2002:aa7:d6c6:: with SMTP id x6mr14725665edr.338.1600039092717; Sun, 13 Sep 2020 16:18:12 -0700 (PDT) Received: from localhost.localdomain ([2604:a880:400:d0::26:8001]) by smtp.gmail.com with ESMTPSA id g20sm6313489ejx.12.2020.09.13.16.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 16:18:11 -0700 (PDT) From: Drew Fustini To: linux-arm-kernel@lists.infradead.org, Tony Lindgren , Rob Herring , linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Linus Walleij , Haojian Zhuang , devicetree@vger.kernel.org, bcousson@baylibre.com, Jason Kridner , Robert Nelson , Trent Piepho Subject: [PATCH v2] pinctrl: single: check pinctrl_spec.args_count > 3 Date: Mon, 14 Sep 2020 01:15:58 +0200 Message-Id: <20200913231557.2063071-1-drew@beagleboard.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200913_191814_963278_A6C71408 X-CRM114-Status: GOOD ( 16.20 ) X-Spam-Score: 0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:544 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.7 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Drew Fustini Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org pinctrl_spec.args_count can either be 2 when #pinctrl-cells = 1 or 3 when #pinctrl-cells = 2. There is currently only a check to make sure that it is 2 or greater. This patch adds a check to make sure it is not greater than 3. Fixes: a13395418888 ("pinctrl: single: parse #pinctrl-cells = 2") Reported-by: Trent Piepho Link: https://lore.kernel.org/linux-omap/3139716.CMS8C0sQ7x@zen.local/ Signed-off-by: Drew Fustini Acked-by: Tony Lindgren --- v2 change: - this is a fix to my prior email where I referred to #pinctrl-cells exceeding 3 which is incorrect. It is pinctrl_spec.args_count which must be greater than 2 (when #pinctrl-cells = 1) and less than 3 (when #pinctrl-cells = 2) https://lore.kernel.org/linux-omap/20200913210825.2022552-1-drew@beagleboard.org/ 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 efe41abc5d47..5cbf0e55087c 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;