Merge tag 'perf-urgent-2020-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (100e3891) · Commits · 戴 / test

kernel/events/core.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -10085,6 +10085,7 @@ perf_event_parse_addr_filter(struct perf_event event, char fstr,
		if (token == IF_SRC_FILE \|\| token == IF_SRC_FILEADDR) {
		int fpos = token == IF_SRC_FILE ? 2 : 1;

		kfree(filename);
		filename = match_strdup(&args[fpos]);
		if (!filename) {
		ret = -ENOMEM;
		@@ -10131,16 +10132,13 @@ perf_event_parse_addr_filter(struct perf_event event, char fstr,
		*/
		ret = -EOPNOTSUPP;
		if (!event->ctx->task)
		goto fail_free_name;
		goto fail;

		/* look up the path and grab its inode */
		ret = kern_path(filename, LOOKUP_FOLLOW,
		&filter->path);
		if (ret)
		goto fail_free_name;

		kfree(filename);
		filename = NULL;
		goto fail;

		ret = -EINVAL;
		if (!filter->path.dentry \|\|
		@@ -10160,13 +10158,13 @@ perf_event_parse_addr_filter(struct perf_event event, char fstr,
		if (state != IF_STATE_ACTION)
		goto fail;

		kfree(filename);
		kfree(orig);

		return 0;

		fail_free_name:
		kfree(filename);
		fail:
		kfree(filename);
		free_filters_list(filters);
		kfree(orig);