From patchwork Wed Mar 8 13:09:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chen Yu X-Patchwork-Id: 66017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp144812wrd; Tue, 7 Mar 2023 21:15:59 -0800 (PST) X-Google-Smtp-Source: AK7set/rn5YTZs2VifPHgVExkIC5CbVL31llqvoqS9rBPBXyEMGmdx6a0gGp14Dywy7yoJqLrNvV X-Received: by 2002:a05:6a21:78a9:b0:c7:13df:e530 with SMTP id bf41-20020a056a2178a900b000c713dfe530mr17236604pzc.6.1678252558984; Tue, 07 Mar 2023 21:15:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678252558; cv=none; d=google.com; s=arc-20160816; b=OcetrTOvoTV1A1Cj0/OBwZ4LYThIpJ8Ey4eBCEUNWphsNvbYrEEpRR5eG80eH/Lfmq Rnbq9ikgNGY9+uJQ8b/G931CT3SiSlypIXARBSGIyUiIQ3wmciCX8TApnv42lg5Ti9xb aD4BBBMglOvSMSGltcGPG6lhwgsgIKYCf7N7SFdDFWZvKXMVkvOIPX4O/BF5ZCiUwncd SqHWSWae7z4OvMPfmDijg40BsSHujyljtBOSwdeFvmTtphINuD0x/m1lrSdDR1Oo06BI MBpN1k7m3fIVP6smiekkTVPjKjgMrSSzNW04KIpaVs5A2RJa0IzdSiuK6JH+IhJMrkJY jxIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=v/Rlejiqyj/iIsBT8N/U4/3pib6RaLd5/bm23YKvgs8=; b=RJJS8LYYeaq/C5IGqFcoaK9IlT1gHSY3c2dMwdRjHNKv852tLC+0VAsKbNc/reAHPo +zA3SyJxp6k6tWTnc1ZAvw9TwZ0+hSJmhmkx9Pc5X6wscMdKUHxfvvi9kDri/zcsbDuK K0Jk7r4EWsNvnKQYkr8mt4A+QPtflp7HVnlF//HYmNqm6UfIq0KTumrOAFjuhseY9lmM kJJNv+9053U0VrOjme3FNSIxgWpmjch83eUoCOaNQhXgTtKUmHyQGXnLt7VRunuWQJql fGgvfrLXVDBT2AfSOd4QgNB6yjqZ12FwlAb6X43mvJgjHYTIFV45qXe/HjnRsL6ZEGa6 11lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mMbEy1yN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y22-20020a626416000000b005e2c94ead4csi13595946pfb.121.2023.03.07.21.15.46; Tue, 07 Mar 2023 21:15:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mMbEy1yN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229606AbjCHFND (ORCPT + 99 others); Wed, 8 Mar 2023 00:13:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229477AbjCHFNB (ORCPT ); Wed, 8 Mar 2023 00:13:01 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C94C44C02; Tue, 7 Mar 2023 21:12:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678252379; x=1709788379; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=tvozT70EfLOxpJDzfJuVfhXexy7OoUDvuPOHFYsw9bk=; b=mMbEy1yNCckYcZS6IlVtxuNDXexvB7TlI+Fp/nClom3EHf87DE3u+xcR 2vRfYMvRCnKJueJuqX3B3HBhXRKWTNcrt6w3HehOirvLxvAqPUzXlW5/V /lZLrGK7aILuChI1TxwE5CH+imZHb5XZOmNjDc903QEWnacrgo4cbNc8j 7ZflNiMp86/nLw5ywfvUaDnmoOhcB1b4QQZv93Bvh+sg55zWTgEQBmxMa vlsvfjdkrYQMfoqSrPntOcxsysrexcpWOI0T/SpsUzCe6jwfW/rJwq3VJ i6Dh4sl2usoecbZSFQbtdtkq6wSAmVDRLDVCU+BYAXxk0APV3h5LeM+Y6 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="398641930" X-IronPort-AV: E=Sophos;i="5.98,242,1673942400"; d="scan'208";a="398641930" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2023 21:12:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="626783809" X-IronPort-AV: E=Sophos;i="5.98,242,1673942400"; d="scan'208";a="626783809" Received: from chenyu-dev.sh.intel.com ([10.239.158.170]) by orsmga003.jf.intel.com with ESMTP; 07 Mar 2023 21:12:57 -0800 From: Chen Yu To: "Rafael J. Wysocki" , Len Brown , Robert Moore Cc: linux-acpi@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-kernel@vger.kernel.org, Chen Yu , Hariganesh Govindarajulu Subject: [PATCH v2] ACPI: tools: pfrut: Check if the input of level and type is in the right numeric range Date: Wed, 8 Mar 2023 21:09:02 +0800 Message-Id: <20230308130902.18397-1-yu.c.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759679205121027147?= X-GMAIL-MSGID: =?utf-8?q?1759775355333401299?= The user provides arbitrary non-numeic value to level and type, which could bring expected bahavior. In this case the expected behavior would be to throw an error. pfrut -h usage: pfrut [OPTIONS] code injection: -l, --load -s, --stage -a, --activate -u, --update [stage and activate] -q, --query -d, --revid update telemetry: -G, --getloginfo -T, --type(0:execution, 1:history) -L, --level(0, 1, 2, 4) -R, --read -D, --revid log pfrut -T A pfrut -G log_level:0 log_type:0 log_revid:2 max_data_size:65536 chunk1_size:0 chunk2_size:1530 rollover_cnt:0 reset_cnt:17 Fix this by restricting the input to be in the expected range. Reported-by: Hariganesh Govindarajulu Suggested-by: "Rafael J. Wysocki" Signed-off-by: Chen Yu --- tools/power/acpi/tools/pfrut/pfrut.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/power/acpi/tools/pfrut/pfrut.c b/tools/power/acpi/tools/pfrut/pfrut.c index 52aa0351533c..13161a6e672d 100644 --- a/tools/power/acpi/tools/pfrut/pfrut.c +++ b/tools/power/acpi/tools/pfrut/pfrut.c @@ -97,7 +97,7 @@ static struct option long_options[] = { static void parse_options(int argc, char **argv) { int option_index = 0; - char *pathname; + char *pathname, *endptr; int opt; pathname = strdup(argv[0]); @@ -125,11 +125,21 @@ static void parse_options(int argc, char **argv) log_getinfo = 1; break; case 'T': - log_type = atoi(optarg); + log_type = strtol(optarg, &endptr, 0); + if(*endptr || (log_type != 0 && log_type != 1)) { + printf("Please provide numeric value for type (0:execution, 1:history) - Exiting.\n"); + exit(1); + } + set_log_type = 1; break; case 'L': - log_level = atoi(optarg); + log_level = strtol(optarg, &endptr, 0); + if(*endptr || (log_level != 0 && log_level != 1 && log_level != 2 && log_level != 4)) { + printf("Please provide numeric value for level (0, 1, 2, 4) - Exiting.\n"); + exit(1); + } + set_log_level = 1; break; case 'R':