| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230612093540.779825032@infradead.org>
Date: Mon, 12 Jun 2023 11:07:58 +0200
From: Peter Zijlstra <peterz@...radead.org>
To: torvalds@...ux-foundation.org, keescook@...omium.org,
gregkh@...uxfoundation.org, pbonzini@...hat.com
Cc: masahiroy@...nel.org, nathan@...nel.org, ndesaulniers@...gle.com,
nicolas@...sle.eu, catalin.marinas@....com, will@...nel.org,
vkoul@...nel.org, trix@...hat.com, ojeda@...nel.org,
peterz@...radead.org, mingo@...hat.com, longman@...hat.com,
boqun.feng@...il.com, dennis@...nel.org, tj@...nel.org,
cl@...ux.com, acme@...nel.org, mark.rutland@....com,
alexander.shishkin@...ux.intel.com, jolsa@...nel.org,
namhyung@...nel.org, irogers@...gle.com, adrian.hunter@...el.com,
juri.lelli@...hat.com, vincent.guittot@...aro.org,
dietmar.eggemann@....com, rostedt@...dmis.org, bsegall@...gle.com,
mgorman@...e.de, bristot@...hat.com, vschneid@...hat.com,
paulmck@...nel.org, frederic@...nel.org, quic_neeraju@...cinc.com,
joel@...lfernandes.org, josh@...htriplett.org,
mathieu.desnoyers@...icios.com, jiangshanlai@...il.com,
rientjes@...gle.com, vbabka@...e.cz, roman.gushchin@...ux.dev,
42.hyeyoo@...il.com, apw@...onical.com, joe@...ches.com,
dwaipayanray1@...il.com, lukas.bulwahn@...il.com,
john.johansen@...onical.com, paul@...l-moore.com,
jmorris@...ei.org, serge@...lyn.com, linux-kbuild@...r.kernel.org,
linux-kernel@...r.kernel.org, dmaengine@...r.kernel.org,
llvm@...ts.linux.dev, linux-perf-users@...r.kernel.org,
rcu@...r.kernel.org, linux-security-module@...r.kernel.org,
tglx@...utronix.de, ravi.bangoria@....com, error27@...il.com,
luc.vanoostenryck@...il.com
Subject: [PATCH v3 45/57] perf: Simplify perf_event_parse_addr_filter()
XXX this code needs a cleanup
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
---
kernel/events/core.c | 56 ++++++++++++++++++++-------------------------------
1 file changed, 22 insertions(+), 34 deletions(-)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -10495,6 +10495,8 @@ static void free_filters_list(struct lis
}
}
+DEFINE_FREE(filter_list, struct list_head *, if (_T) free_filters_list(_T))
+
/*
* Free existing address filters and optionally install new ones
*/
@@ -10658,13 +10660,15 @@ perf_event_parse_addr_filter(struct perf
struct list_head *filters)
{
struct perf_addr_filter *filter = NULL;
- char *start, *orig, *filename = NULL;
substring_t args[MAX_OPT_ARGS];
int state = IF_STATE_ACTION, token;
unsigned int kernel = 0;
- int ret = -EINVAL;
+ char *start;
+ int ret;
- orig = fstr = kstrdup(fstr, GFP_KERNEL);
+ struct list_head *fguard __free(filter_list) = filters;
+ char *filename __free(kfree) = NULL;
+ char *orig __free(kfree) = fstr = kstrdup(fstr, GFP_KERNEL);
if (!fstr)
return -ENOMEM;
@@ -10674,7 +10678,6 @@ perf_event_parse_addr_filter(struct perf
[IF_ACT_START] = PERF_ADDR_FILTER_ACTION_START,
[IF_ACT_STOP] = PERF_ADDR_FILTER_ACTION_STOP,
};
- ret = -EINVAL;
if (!*start)
continue;
@@ -10683,7 +10686,7 @@ perf_event_parse_addr_filter(struct perf
if (state == IF_STATE_ACTION) {
filter = perf_addr_filter_new(event, filters);
if (!filter)
- goto fail;
+ return -EINVAL;
}
token = match_token(start, if_tokens, args);
@@ -10692,7 +10695,7 @@ perf_event_parse_addr_filter(struct perf
case IF_ACT_START:
case IF_ACT_STOP:
if (state != IF_STATE_ACTION)
- goto fail;
+ return -EINVAL;
filter->action = actions[token];
state = IF_STATE_SOURCE;
@@ -10706,18 +10709,18 @@ perf_event_parse_addr_filter(struct perf
case IF_SRC_FILEADDR:
case IF_SRC_FILE:
if (state != IF_STATE_SOURCE)
- goto fail;
+ return -EINVAL;
*args[0].to = 0;
ret = kstrtoul(args[0].from, 0, &filter->offset);
if (ret)
- goto fail;
+ return ret;
if (token == IF_SRC_KERNEL || token == IF_SRC_FILE) {
*args[1].to = 0;
ret = kstrtoul(args[1].from, 0, &filter->size);
if (ret)
- goto fail;
+ return ret;
}
if (token == IF_SRC_FILE || token == IF_SRC_FILEADDR) {
@@ -10725,17 +10728,15 @@ perf_event_parse_addr_filter(struct perf
kfree(filename);
filename = match_strdup(&args[fpos]);
- if (!filename) {
- ret = -ENOMEM;
- goto fail;
- }
+ if (!filename)
+ return -ENOMEM;
}
state = IF_STATE_END;
break;
default:
- goto fail;
+ return -EINVAL;
}
/*
@@ -10744,19 +10745,17 @@ perf_event_parse_addr_filter(struct perf
* attribute.
*/
if (state == IF_STATE_END) {
- ret = -EINVAL;
-
/*
* ACTION "filter" must have a non-zero length region
* specified.
*/
if (filter->action == PERF_ADDR_FILTER_ACTION_FILTER &&
!filter->size)
- goto fail;
+ return -EINVAL;
if (!kernel) {
if (!filename)
- goto fail;
+ return -EINVAL;
/*
* For now, we only support file-based filters
@@ -10766,21 +10765,19 @@ perf_event_parse_addr_filter(struct perf
* mapped at different virtual addresses in
* different processes.
*/
- ret = -EOPNOTSUPP;
if (!event->ctx->task)
- goto fail;
+ return -EOPNOTSUPP;
/* look up the path and grab its inode */
ret = kern_path(filename, LOOKUP_FOLLOW,
&filter->path);
if (ret)
- goto fail;
+ return ret;
- ret = -EINVAL;
if (!filter->path.dentry ||
!S_ISREG(d_inode(filter->path.dentry)
->i_mode))
- goto fail;
+ return -EINVAL;
event->addr_filters.nr_file_filters++;
}
@@ -10795,19 +10792,10 @@ perf_event_parse_addr_filter(struct perf
}
if (state != IF_STATE_ACTION)
- goto fail;
-
- kfree(filename);
- kfree(orig);
+ return -EINVAL;
+ no_free_ptr(fguard); // allow filters to escape to the caller
return 0;
-
-fail:
- kfree(filename);
- free_filters_list(filters);
- kfree(orig);
-
- return ret;
}
static int
Powered by blists - more mailing lists