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 X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 5EE69C43463 for ; Fri, 18 Sep 2020 03:02:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 18045206B6 for ; Fri, 18 Sep 2020 03:02:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600398179; bh=E350A/ai66N1iyvBYmzJeu358jXKJGXYFP/kPyZJ50Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ojq6cWnEG2+3SWmjefEkdTmzzsdriBxL3LT3ME3CaCRl6Udp5MwBlIkUAb3kcrZLc 5+FoR71u19EG9BRRaBbclUIPTz4eA/Wa+Fxa2oZRihsYnsx+7NnlgAO3k4+OroRLyF p0aSsoWb/jcJehCNSMNgi9Frc+i55AIQNnpz6vc0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730427AbgIRDC5 (ORCPT ); Thu, 17 Sep 2020 23:02:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:53366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727472AbgIRCFN (ORCPT ); Thu, 17 Sep 2020 22:05:13 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5179C23718; Fri, 18 Sep 2020 02:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600394712; bh=E350A/ai66N1iyvBYmzJeu358jXKJGXYFP/kPyZJ50Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y4K3AlcUu93pfR3PzXwm14J2zELssw3IEClIuJjT7334dkRimjVena0C1qAmREKYx Zcl+wiBOB9zsSgS9qOa0W94uZOShQe41mpYdGvmM1/WTZDkjyRhJTz4edN/VQiz4Bk oixKCutxSja/5AJQ04KFKvtrbyrkKkoSiaZ81wxg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gabriel Ravier , Bartosz Golaszewski , Sasha Levin Subject: [PATCH AUTOSEL 5.4 197/330] tools: gpio-hammer: Avoid potential overflow in main Date: Thu, 17 Sep 2020 21:58:57 -0400 Message-Id: <20200918020110.2063155-197-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020110.2063155-1-sashal@kernel.org> References: <20200918020110.2063155-1-sashal@kernel.org> 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: Gabriel Ravier [ Upstream commit d1ee7e1f5c9191afb69ce46cc7752e4257340a31 ] If '-o' was used more than 64 times in a single invocation of gpio-hammer, this could lead to an overflow of the 'lines' array. This commit fixes this by avoiding the overflow and giving a proper diagnostic back to the user Signed-off-by: Gabriel Ravier Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin --- tools/gpio/gpio-hammer.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/gpio/gpio-hammer.c b/tools/gpio/gpio-hammer.c index 0e0060a6eb346..083399d276e4e 100644 --- a/tools/gpio/gpio-hammer.c +++ b/tools/gpio/gpio-hammer.c @@ -135,7 +135,14 @@ int main(int argc, char **argv) device_name = optarg; break; case 'o': - lines[i] = strtoul(optarg, NULL, 10); + /* + * Avoid overflow. Do not immediately error, we want to + * be able to accurately report on the amount of times + * '-o' was given to give an accurate error message + */ + if (i < GPIOHANDLES_MAX) + lines[i] = strtoul(optarg, NULL, 10); + i++; break; case '?': @@ -143,6 +150,14 @@ int main(int argc, char **argv) return -1; } } + + if (i >= GPIOHANDLES_MAX) { + fprintf(stderr, + "Only %d occurences of '-o' are allowed, %d were found\n", + GPIOHANDLES_MAX, i + 1); + return -1; + } + nlines = i; if (!device_name || !nlines) { -- 2.25.1