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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28C75C433F5 for ; Mon, 27 Dec 2021 19:06:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232240AbhL0TGj (ORCPT ); Mon, 27 Dec 2021 14:06:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232395AbhL0TFw (ORCPT ); Mon, 27 Dec 2021 14:05:52 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2152BC06175D; Mon, 27 Dec 2021 11:05:52 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id D16D7B8113A; Mon, 27 Dec 2021 19:05:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67141C36AE7; Mon, 27 Dec 2021 19:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640631949; bh=8VZ29EPK+glZgDwGOcZ0XbkQAD0GWI9t47yLwmdbulo=; h=From:To:Cc:Subject:Date:From; b=pWW0CejeRylZXNwMuxVpE3Ki/cD/tO4igsF8A/AoMaUaIi0pnWSHeXHRixpIyd5vR VbgxQ8wTacpEZQXf36gCb8pS6YxcgL0DVRkhMHtdPAcyDEd1dt7O28rRN8Ckj4QKyC m1A/LuZ/q2fpmqp/xGHTYVHUAMkFW5RMAPFI4Y5jOmEW2IKlfrAp+cohDd9zcxDz+H iGIprO8tnMS3XpRedVDBUsDTQeO/oB1DYaGklCKZ7AQZc3lj1wpa3J7oCbJISyQdAR zKnD/UnRvGfFx+UN5eUqvfZHwfaGsLUZzezHxwcreBjBQfK9K5fzgVqtmUty2L3PrG 0rkXp6e+Hc9nQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guodong Liu , Zhiyong Tao , Chen-Yu Tsai , Linus Walleij , Sasha Levin , sean.wang@kernel.org, matthias.bgg@gmail.com, linux-mediatek@lists.infradead.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 1/9] pinctrl: mediatek: fix global-out-of-bounds issue Date: Mon, 27 Dec 2021 14:05:28 -0500 Message-Id: <20211227190536.1042975-1-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guodong Liu [ Upstream commit 2d5446da5acecf9c67db1c9d55ae2c3e5de01f8d ] When eint virtual eint number is greater than gpio number, it maybe produce 'desc[eint_n]' size globle-out-of-bounds issue. Signed-off-by: Guodong Liu Signed-off-by: Zhiyong Tao Reviewed-by: Chen-Yu Tsai Link: https://lore.kernel.org/r/20211110071900.4490-2-zhiyong.tao@mediatek.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index 20e1c890e73b3..c3e6f3c1b4743 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -236,8 +236,12 @@ static int mtk_xt_get_gpio_n(void *data, unsigned long eint_n, desc = (const struct mtk_pin_desc *)hw->soc->pins; *gpio_chip = &hw->chip; - /* Be greedy to guess first gpio_n is equal to eint_n */ - if (desc[eint_n].eint.eint_n == eint_n) + /* + * Be greedy to guess first gpio_n is equal to eint_n. + * Only eint virtual eint number is greater than gpio number. + */ + if (hw->soc->npins > eint_n && + desc[eint_n].eint.eint_n == eint_n) *gpio_n = eint_n; else *gpio_n = mtk_xt_find_eint_num(hw, eint_n); -- 2.34.1