Linux-perf-users Archive on lore.kernel.org
 help / color / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-perf-users@vger.kernel.org,
	linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v6 10/11] perf tools script: Add array bound checking to list_scripts
Date: Mon, 11 Mar 2019 07:45:01 -0700
Message-ID: <20190311144502.15423-11-andi@firstfloor.org> (raw)
In-Reply-To: <20190311144502.15423-1-andi@firstfloor.org>

From: Andi Kleen <ak@linux.intel.com>

Don't overflow array when the scripts directory is too large,
or the script file name is too long.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 tools/perf/builtin-script.c      | 8 ++++++--
 tools/perf/builtin.h             | 3 ++-
 tools/perf/ui/browsers/scripts.c | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index b695b20ffc8a..2f93d60c5a17 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2982,7 +2982,8 @@ static int check_ev_match(char *dir_name, char *scriptname,
  * will list all statically runnable scripts, select one, execute it and
  * show the output in a perf browser.
  */
-int find_scripts(char **scripts_array, char **scripts_path_array)
+int find_scripts(char **scripts_array, char **scripts_path_array, int num,
+		 int pathlen)
 {
 	struct dirent *script_dirent, *lang_dirent;
 	char scripts_path[MAXPATHLEN], lang_path[MAXPATHLEN];
@@ -3027,7 +3028,10 @@ int find_scripts(char **scripts_array, char **scripts_path_array)
 			/* Skip those real time scripts: xxxtop.p[yl] */
 			if (strstr(script_dirent->d_name, "top."))
 				continue;
-			sprintf(scripts_path_array[i], "%s/%s", lang_path,
+			if (i >= num)
+				break;
+			snprintf(scripts_path_array[i], pathlen, "%s/%s",
+				lang_path,
 				script_dirent->d_name);
 			temp = strchr(script_dirent->d_name, '.');
 			snprintf(scripts_array[i],
diff --git a/tools/perf/builtin.h b/tools/perf/builtin.h
index 05745f3ce912..999fe9170122 100644
--- a/tools/perf/builtin.h
+++ b/tools/perf/builtin.h
@@ -40,5 +40,6 @@ int cmd_mem(int argc, const char **argv);
 int cmd_data(int argc, const char **argv);
 int cmd_ftrace(int argc, const char **argv);
 
-int find_scripts(char **scripts_array, char **scripts_path_array);
+int find_scripts(char **scripts_array, char **scripts_path_array, int num,
+		 int pathlen);
 #endif
diff --git a/tools/perf/ui/browsers/scripts.c b/tools/perf/ui/browsers/scripts.c
index 5d407ab834b5..6759d6657e1a 100644
--- a/tools/perf/ui/browsers/scripts.c
+++ b/tools/perf/ui/browsers/scripts.c
@@ -117,7 +117,8 @@ static int list_scripts(char *script_name, bool *custom,
 		paths[i] = names[i] + SCRIPT_NAMELEN;
 	}
 
-	num = find_scripts(names + max_std, paths + max_std);
+	num = find_scripts(names + max_std, paths + max_std, SCRIPT_MAX_NO - max_std,
+			SCRIPT_FULLPATH_LEN);
 	if (num < 0)
 		num = 0;
 	choice = ui__popup_menu(num + max_std, (char * const *)names);
-- 
2.20.1

  parent reply index

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-11 14:44 Support sample context in perf report Andi Kleen
2019-03-11 14:44 ` [PATCH v6 01/11] perf tools script: Filter COMM/FORK/.. events by CPU Andi Kleen
2019-03-11 16:58   ` Arnaldo Carvalho de Melo
2019-03-11 14:44 ` [PATCH v6 02/11] perf tools report: Parse time quantum Andi Kleen
2019-03-11 16:59   ` Arnaldo Carvalho de Melo
2019-03-11 14:44 ` [PATCH v6 03/11] perf tools report: Support time sort key Andi Kleen
2019-03-11 17:04   ` Arnaldo Carvalho de Melo
2019-03-11 14:44 ` [PATCH v6 04/11] perf tools report: Use less for scripts output Andi Kleen
2019-03-11 17:05   ` Arnaldo Carvalho de Melo
2019-03-11 14:44 ` [PATCH v6 05/11] perf tools report: Support running scripts for current time range Andi Kleen
2019-03-11 17:06   ` Arnaldo Carvalho de Melo
2019-03-11 14:44 ` [PATCH v6 06/11] perf tools report: Support builtin perf script in scripts menu Andi Kleen
2019-03-11 17:09   ` Arnaldo Carvalho de Melo
2019-03-11 14:44 ` [PATCH v6 07/11] perf tools report: Implement browsing of individual samples Andi Kleen
2019-03-11 17:24   ` Jiri Olsa
2019-03-11 17:46     ` Andi Kleen
2019-03-11 18:35       ` Arnaldo Carvalho de Melo
2019-03-11 19:04         ` Andi Kleen
2019-03-11 14:44 ` [PATCH v6 08/11] perf tools: Add some new tips describing the new options Andi Kleen
2019-03-11 14:45 ` [PATCH v6 09/11] perf tools report: Add custom scripts to script menu Andi Kleen
2019-03-11 18:10   ` Arnaldo Carvalho de Melo
2019-03-11 18:34     ` Andi Kleen
2019-03-11 18:45       ` Arnaldo Carvalho de Melo
2019-03-11 14:45 ` Andi Kleen [this message]
2019-03-11 18:18   ` [PATCH v6 10/11] perf tools script: Add array bound checking to list_scripts Arnaldo Carvalho de Melo
2019-03-11 14:45 ` [PATCH v6 11/11] perf tools ui: Fix ui popup browser for many entries Andi Kleen
2019-03-11 18:17   ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190311144502.15423-11-andi@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-perf-users Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-perf-users/0 linux-perf-users/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-perf-users linux-perf-users/ https://lore.kernel.org/linux-perf-users \
		linux-perf-users@vger.kernel.org
	public-inbox-index linux-perf-users

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-perf-users


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git