From nobody Sat Feb 7 14:05:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3548C1D9346; Tue, 7 Jan 2025 11:50:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250620; cv=none; b=UBZ6n2HYjRtkZBhI/H2vvh/lwXf1Y+BAHKKVvGHigOiU8tNQUglo4g/21th5IBUIEttYOOf8YiEfrMpct1LnEvIpBAPP/i7HkbHSawX/jUWJKHCyAyN4CdCwxSPXynr9nlPfbReHjlgHAbkU5t6fWUHbaG+tyKyM7V8+dtQNBDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250620; c=relaxed/simple; bh=6QyVNa11BsehG9ROF+5/Jw9ETQ4uZvxVJBFzAmC3XNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CcS2FUiwourPoBpuWajt/4WRAW+Pc+pruqY2xVy+1wb53GJK+jce13urke0m/6cqTQr3ZxLB18P9mDIi1ObvaVTr9+0SNp6QYdko0mam0vQX8y/cKHe8x9LuwL+hJW6iNNbPH9cmq9h92q6UVJd2oUcfftFYc9YsLUtGjgICXo8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jNjH1AOM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jNjH1AOM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D75EBC4CED6; Tue, 7 Jan 2025 11:50:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736250619; bh=6QyVNa11BsehG9ROF+5/Jw9ETQ4uZvxVJBFzAmC3XNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jNjH1AOMNRChGUkPn6vZgXsglPcBbaRi9w78CRZ0yVS3AmumOrg+bW/62tx9SjWvu bEZ44UARWY8d4JAZMPmeL3JeKfTaNxZByXmcsHp6tfbJaOdfnnpV7y5y2iDbIxpT9L 4kv6qHbWnqjJnOaVRUzMso6zsqJeLRT3mkcpz1OdIz7fLahIqchh3lfIKuo3kfEt1S sDkgMaqJ0Rn5AsWnH841qoV4z0o6sEcHKi2GcrtFbMJTCCEflx6TQWJWw+EYLrYW+B CKM1NgvRp+PToCBWf+9UEGz+5Nklw1gDrvyQM5m5UquhxFWD1+DfBLkWc4tayhnDE9 OrTy0dCdo3EdA== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Peter Zijlstra Cc: Anil S Keshavamurthy , Masami Hiramatsu , "David S . Miller" , Mathieu Desnoyers , Oleg Nesterov , Tzvetomir Stoyanov , Naveen N Rao , Josh Poimboeuf , Jason Baron , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v3 1/5] tracing/kprobes: Fix to free objects when failed to copy a symbol Date: Tue, 7 Jan 2025 20:50:14 +0900 Message-ID: <173625061422.1375434.3546795892167224013.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173625060316.1375434.11048027439794595989.stgit@devnote2> References: <173625060316.1375434.11048027439794595989.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) In __trace_kprobe_create(), if something fails it must goto error block to free objects. But when strdup() a symbol, it returns without that. Fix it to goto the error block to free objects correctly. Fixes: 6212dd29683e ("tracing/kprobes: Use dyn_event framework for kprobe e= vents") Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_kprobe.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 263fac44d3ca..fb9d4dffa66e 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -940,8 +940,10 @@ static int __trace_kprobe_create(int argc, const char = *argv[]) } /* a symbol specified */ symbol =3D kstrdup(argv[1], GFP_KERNEL); - if (!symbol) - return -ENOMEM; + if (!symbol) { + ret =3D -ENOMEM; + goto error; + } =20 tmp =3D strchr(symbol, '%'); if (tmp) { From nobody Sat Feb 7 14:05:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA73886328; Tue, 7 Jan 2025 11:50:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250630; cv=none; b=T4W3Ksp2fmEPyKP2yhoG1l/kDUTaP2/KnJxOrMiv4v0djvwfYPsMay3N5RpnflUDZ39lYs2184KwMwNFEeQtpmUms2x+xN+yDaPrEljubxzQNEtkTJjIBLSrkpWs6SMdFzQfrMzTbGlalcSW/tvvXjPsmCw2r7klF3R2Z4UhgeU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250630; c=relaxed/simple; bh=BcADqpQVIfcOvYJDWh5fJTXzfcEJmhMIEhtchptg8lU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cy7XezKBfMPJwT91FUCxAQeyzmjAK1ONrVH8y+TH8k39BhFTBpOjtFj/LrgxPajHrGuM4OFELeHYm/aVSjrxUNe6U3M8a0WJYbehYiCqyZXevkR2U6fFow/jWtRUTIojI+vRZfTUiwgvXSsq+LsEffxPpc9CiDmkDs4SqPWoQks= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rt1thpKf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rt1thpKf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9AD92C4CEDF; Tue, 7 Jan 2025 11:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736250630; bh=BcADqpQVIfcOvYJDWh5fJTXzfcEJmhMIEhtchptg8lU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rt1thpKfSyNNNKAif5eGE334bNXTofElcZBuM48IYJHPeLsSx5vFFolcUT2Fnw1CF lzyN7QSRSBx61o+X6otBzdJx5UHSUxPXuVnISw3G605uZ8Fda5RmhYKK3u9V3+Ae96 osDPK1xm+aJqQWCsqBY4o4J/29H+9QeJ1akWktsY+bBPy+wY2BJQwsDn5PFwf9JOLu mg5KR4iP5+sAzgStj6Sc3IvDg2+xwLf4HduHeSnn5bd9C1KqEy0Hi+9VUSQ9oYp+2L TeZ31tnk5booceRO4JhxzbpC9DgfGeDXrhx2thdzI5/KlVKfq5sQt8Y1DyWv7aqzMG 97yGwfgu+VAWw== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Peter Zijlstra Cc: Anil S Keshavamurthy , Masami Hiramatsu , "David S . Miller" , Mathieu Desnoyers , Oleg Nesterov , Tzvetomir Stoyanov , Naveen N Rao , Josh Poimboeuf , Jason Baron , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v3 2/5] tracing: Use __free() in trace_probe for cleanup Date: Tue, 7 Jan 2025 20:50:25 +0900 Message-ID: <173625062518.1375434.10516553019799245668.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173625060316.1375434.11048027439794595989.stgit@devnote2> References: <173625060316.1375434.11048027439794595989.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Use __free() in trace_probe to cleanup some gotos. Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_probe.c | 52 +++++++++++++++-------------------------= ---- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 16a5e368e7b7..bf6a7b81ae95 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -1409,7 +1409,7 @@ static int traceprobe_parse_probe_arg_body(const char= *argv, ssize_t *size, struct traceprobe_parse_context *ctx) { struct fetch_insn *code, *tmp =3D NULL; - char *type, *arg; + char *type, *arg __free(kfree) =3D NULL; int ret, len; =20 len =3D strlen(argv); @@ -1426,22 +1426,16 @@ static int traceprobe_parse_probe_arg_body(const ch= ar *argv, ssize_t *size, return -ENOMEM; =20 parg->comm =3D kstrdup(arg, GFP_KERNEL); - if (!parg->comm) { - ret =3D -ENOMEM; - goto out; - } + if (!parg->comm) + return -ENOMEM; =20 type =3D parse_probe_arg_type(arg, parg, ctx); - if (IS_ERR(type)) { - ret =3D PTR_ERR(type); - goto out; - } + if (IS_ERR(type)) + return PTR_ERR(type); =20 code =3D tmp =3D kcalloc(FETCH_INSN_MAX, sizeof(*code), GFP_KERNEL); - if (!code) { - ret =3D -ENOMEM; - goto out; - } + if (!code) + return -ENOMEM; code[FETCH_INSN_MAX - 1].op =3D FETCH_OP_END; =20 ctx->last_type =3D NULL; @@ -1497,8 +1491,6 @@ static int traceprobe_parse_probe_arg_body(const char= *argv, ssize_t *size, kfree(code->data); } kfree(tmp); -out: - kfree(arg); =20 return ret; } @@ -1668,7 +1660,7 @@ const char **traceprobe_expand_meta_args(int argc, co= nst char *argv[], { const struct btf_param *params =3D NULL; int i, j, n, used, ret, args_idx =3D -1; - const char **new_argv =3D NULL; + const char **new_argv __free(kfree) =3D NULL; =20 ret =3D argv_has_var_arg(argc, argv, &args_idx, ctx); if (ret < 0) @@ -1707,7 +1699,7 @@ const char **traceprobe_expand_meta_args(int argc, co= nst char *argv[], ret =3D sprint_nth_btf_arg(n, "", buf + used, bufsize - used, ctx); if (ret < 0) - goto error; + return ERR_PTR(ret); =20 new_argv[j++] =3D buf + used; used +=3D ret + 1; @@ -1721,25 +1713,20 @@ const char **traceprobe_expand_meta_args(int argc, = const char *argv[], n =3D simple_strtoul(argv[i] + 4, &type, 10); if (type && !(*type =3D=3D ':' || *type =3D=3D '\0')) { trace_probe_log_err(0, BAD_VAR); - ret =3D -ENOENT; - goto error; + return ERR_PTR(-ENOENT); } /* Note: $argN starts from $arg1 */ ret =3D sprint_nth_btf_arg(n - 1, type, buf + used, bufsize - used, ctx); if (ret < 0) - goto error; + return ERR_PTR(ret); new_argv[j++] =3D buf + used; used +=3D ret + 1; } else new_argv[j++] =3D argv[i]; } =20 - return new_argv; - -error: - kfree(new_argv); - return ERR_PTR(ret); + return_ptr(new_argv); } =20 /* @buf: *buf must be equal to NULL. Caller must to free *buf */ @@ -1747,14 +1734,14 @@ int traceprobe_expand_dentry_args(int argc, const c= har *argv[], char **buf) { int i, used, ret; const int bufsize =3D MAX_DENTRY_ARGS_LEN; - char *tmpbuf =3D NULL; + char *tmpbuf __free(kfree) =3D NULL; =20 if (*buf) return -EINVAL; =20 used =3D 0; for (i =3D 0; i < argc; i++) { - char *tmp; + char *tmp __free(kfree) =3D NULL; char *equal; size_t arg_len; =20 @@ -1769,7 +1756,7 @@ int traceprobe_expand_dentry_args(int argc, const cha= r *argv[], char **buf) =20 tmp =3D kstrdup(argv[i], GFP_KERNEL); if (!tmp) - goto nomem; + return -ENOMEM; =20 equal =3D strchr(tmp, '=3D'); if (equal) @@ -1790,18 +1777,15 @@ int traceprobe_expand_dentry_args(int argc, const c= har *argv[], char **buf) offsetof(struct file, f_path.dentry), equal ? equal + 1 : tmp); =20 - kfree(tmp); + kfree(no_free_ptr(tmp)); if (ret >=3D bufsize - used) - goto nomem; + return -ENOMEM; argv[i] =3D tmpbuf + used; used +=3D ret + 1; } =20 - *buf =3D tmpbuf; + *buf =3D no_free_ptr(tmpbuf); return 0; -nomem: - kfree(tmpbuf); - return -ENOMEM; } =20 void traceprobe_finish_parse(struct traceprobe_parse_context *ctx) From nobody Sat Feb 7 14:05:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D38091E3DCC; Tue, 7 Jan 2025 11:50:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250641; cv=none; b=Toy48syN/hUKAaQG0Wsk0MeTBC4hk6LxeiAXWNGttDL9SS1gQO2p/WdD0kPFjj7fEBVuSW5anx79QXm0PjhaAII5tV9we0Pc6GyLZDM8AO/aPiYJklwPtjHfOU18SYQUqXPJWb/d+ls0EVCGRMonH1TK+PNFzwj3cH8M0Q5v8ZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250641; c=relaxed/simple; bh=tV3TflQ8K5yeFK5RhAYb/HAmHfcz0UsjSC1mWs+Npcc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YiJpaRxVKYmBG48CoKgLINoO3btdNo1CegYP0bWhYnc274TEgquIUsoTdPn892gv3BBvaL3hyHu+b84dvB6f19oa8LTb9jemCy1oxtYYWMVWb+m5Tp2Bi09NndZGWNXyQ4ixs+XaS5alG+jvWvlng5Lqrd4xX802e+LhwVv2HWM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rJZyTzjs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rJZyTzjs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C428C4CEDF; Tue, 7 Jan 2025 11:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736250641; bh=tV3TflQ8K5yeFK5RhAYb/HAmHfcz0UsjSC1mWs+Npcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rJZyTzjsvlx3JK3MI/MSBxAsX0TPR30jPQ5YkikUlac0PAQus8Zah+mCwtuBVWAXO dssazyMftxSIVcaZ01nv59rtI43cloCUdYq4nbiYepizeIvHLTS4pmXAxEZVmG11xD D2B2yg99yO8pOuFss4CPYn4tDVACqTFShUAANdm8f8KUqZE9h0qN4mxYN3sXMNsM76 HJ9PF1CGNqqKhM7FXrMVvXKL2n6K9btBx4YlhuEUM7gXulyrG5IHia2RwdyuDzWrM1 nDrA6ND8b6vP8hQdQQToviBdqUEl7rY8o5vpzem/MOLQWmyyt0b3wkt2n+itHj6E2T H52gKP90Km3RQ== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Peter Zijlstra Cc: Anil S Keshavamurthy , Masami Hiramatsu , "David S . Miller" , Mathieu Desnoyers , Oleg Nesterov , Tzvetomir Stoyanov , Naveen N Rao , Josh Poimboeuf , Jason Baron , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v3 3/5] tracing: Use __free() for kprobe events to cleanup Date: Tue, 7 Jan 2025 20:50:35 +0900 Message-ID: <173625063552.1375434.16867809967348842161.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173625060316.1375434.11048027439794595989.stgit@devnote2> References: <173625060316.1375434.11048027439794595989.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Use __free() in trace_kprobe.c to cleanup code. Signed-off-by: Masami Hiramatsu (Google) --- Changes in v3: - Rename to __free(free_trace_kprobe) to clarify what function will be ca= lled. - Add !IS_ERR_OR_NULL() check because alloc_trace_kprobe() returns an err= or code. - Prevent freeing 'tk' in create_local_trace_kprobe() when succeeded to r= egister. Changes in v2: - Instead of using no_free_ptr(), just assign NULL to the registered poin= ter. --- kernel/trace/trace_kprobe.c | 63 +++++++++++++++++++++------------------= ---- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index fb9d4dffa66e..2d8b5ef47e96 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -8,6 +8,7 @@ #define pr_fmt(fmt) "trace_kprobe: " fmt =20 #include +#include #include #include #include @@ -257,6 +258,9 @@ static void free_trace_kprobe(struct trace_kprobe *tk) } } =20 +DEFINE_FREE(free_trace_kprobe, struct trace_kprobe *, + if (!IS_ERR_OR_NULL(_T)) free_trace_kprobe(_T)) + /* * Allocate new trace_probe and initialize it (including kprobes). */ @@ -268,7 +272,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const ch= ar *group, int maxactive, int nargs, bool is_return) { - struct trace_kprobe *tk; + struct trace_kprobe *tk __free(free_trace_kprobe) =3D NULL; int ret =3D -ENOMEM; =20 tk =3D kzalloc(struct_size(tk, tp.args, nargs), GFP_KERNEL); @@ -277,12 +281,12 @@ static struct trace_kprobe *alloc_trace_kprobe(const = char *group, =20 tk->nhit =3D alloc_percpu(unsigned long); if (!tk->nhit) - goto error; + return ERR_PTR(ret); =20 if (symbol) { tk->symbol =3D kstrdup(symbol, GFP_KERNEL); if (!tk->symbol) - goto error; + return ERR_PTR(ret); tk->rp.kp.symbol_name =3D tk->symbol; tk->rp.kp.offset =3D offs; } else @@ -299,13 +303,10 @@ static struct trace_kprobe *alloc_trace_kprobe(const = char *group, =20 ret =3D trace_probe_init(&tk->tp, event, group, false, nargs); if (ret < 0) - goto error; + return ERR_PTR(ret); =20 dyn_event_init(&tk->devent, &trace_kprobe_ops); - return tk; -error: - free_trace_kprobe(tk); - return ERR_PTR(ret); + return_ptr(tk); } =20 static struct trace_kprobe *find_trace_kprobe(const char *event, @@ -866,11 +867,12 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) * Type of args: * FETCHARG:TYPE : use TYPE instead of unsigned long. */ - struct trace_kprobe *tk =3D NULL; + struct trace_kprobe *tk __free(free_trace_kprobe) =3D NULL; int i, len, new_argc =3D 0, ret =3D 0; bool is_return =3D false; - char *symbol =3D NULL, *tmp =3D NULL; - const char **new_argv =3D NULL; + char *symbol __free(kfree) =3D NULL; + char *tmp =3D NULL; + const char **new_argv __free(kfree) =3D NULL; const char *event =3D NULL, *group =3D KPROBE_EVENT_SYSTEM; enum probe_print_type ptype; int maxactive =3D 0; @@ -879,7 +881,7 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) char buf[MAX_EVENT_NAME_LEN]; char gbuf[MAX_EVENT_NAME_LEN]; char abuf[MAX_BTF_ARGS_LEN]; - char *dbuf =3D NULL; + char *dbuf __free(kfree) =3D NULL; struct traceprobe_parse_context ctx =3D { .flags =3D TPARG_FL_KERNEL }; =20 switch (argv[0][0]) { @@ -936,7 +938,7 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) /* Check whether uprobe event specified */ if (strchr(argv[1], '/') && strchr(argv[1], ':')) { ret =3D -ECANCELED; - goto error; + goto out; } /* a symbol specified */ symbol =3D kstrdup(argv[1], GFP_KERNEL); @@ -1040,7 +1042,7 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) ctx.offset =3D 0; ret =3D traceprobe_parse_probe_arg(&tk->tp, i, argv[i], &ctx); if (ret) - goto error; /* This can be -ENOMEM */ + goto out; /* This can be -ENOMEM */ } /* entry handler for kretprobe */ if (is_return && tk->tp.entry_arg) { @@ -1051,7 +1053,7 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) ptype =3D is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL; ret =3D traceprobe_set_print_fmt(&tk->tp, ptype); if (ret < 0) - goto error; + goto out; =20 ret =3D register_trace_kprobe(tk); if (ret) { @@ -1062,21 +1064,20 @@ static int __trace_kprobe_create(int argc, const ch= ar *argv[]) trace_probe_log_err(0, BAD_PROBE_ADDR); else if (ret !=3D -ENOMEM && ret !=3D -EEXIST) trace_probe_log_err(0, FAIL_REG_PROBE); - goto error; - } + } else + /* + * Here, 'tk' has been registered to the list successfully, + * so we don't need to free it. + */ + tk =3D NULL; =20 out: traceprobe_finish_parse(&ctx); trace_probe_log_clear(); - kfree(new_argv); - kfree(symbol); - kfree(dbuf); return ret; =20 parse_error: ret =3D -EINVAL; -error: - free_trace_kprobe(tk); goto out; } =20 @@ -1898,7 +1899,8 @@ create_local_trace_kprobe(char *func, void *addr, uns= igned long offs, bool is_return) { enum probe_print_type ptype; - struct trace_kprobe *tk; + struct trace_kprobe *tk __free(free_trace_kprobe) =3D NULL; + struct trace_probe *tp; int ret; char *event; =20 @@ -1929,19 +1931,16 @@ create_local_trace_kprobe(char *func, void *addr, u= nsigned long offs, =20 ptype =3D trace_kprobe_is_return(tk) ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL; - if (traceprobe_set_print_fmt(&tk->tp, ptype) < 0) { - ret =3D -ENOMEM; - goto error; - } + if (traceprobe_set_print_fmt(&tk->tp, ptype) < 0) + return ERR_PTR(-ENOMEM); =20 ret =3D __register_trace_kprobe(tk); if (ret < 0) - goto error; + return ERR_PTR(ret); =20 - return trace_probe_event_call(&tk->tp); -error: - free_trace_kprobe(tk); - return ERR_PTR(ret); + tp =3D &tk->tp; + tk =3D NULL; /* 'tk' is registered successfully, so do not free. */ + return trace_probe_event_call(tp); } =20 void destroy_local_trace_kprobe(struct trace_event_call *event_call) From nobody Sat Feb 7 14:05:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 045281E379F; Tue, 7 Jan 2025 11:50:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250653; cv=none; b=Gi5gC8TNhrCFg1vwHwGI6lMWlcotnS5igo0Sqkpj50/TtVjReyM+afuRlO/0j+fd3aJ4EuI6akF+/X+Yx7Yp15l93+wmWPfsTFUscw3zynoU12xqnPxc5RlwbK5ocz/5CZBXZxgLRfFKtCqMTSMHtnDDlgGyvyvsxEUjRzAZe8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250653; c=relaxed/simple; bh=oz75zD4hz8TVndlevnw8+K50k+0vYc6T0yklKGuI40g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=m50f0Kya6T2bCHIvQugHYcfjNRbotUi2rs3DW+NUA5lj/Qlj7NW2+EA3U3bGPd7J41c9AZn16LuGBk81SUB4eFGmqq3tdW0fgZWsdPzvvhdezYh48x9eTXQr90mkZS3sfSdCCQ0tbzsB5FEDM3aqFsow7HQYSaMobKqSqRiv870= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HkGu2ro8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HkGu2ro8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9EFF6C4CED6; Tue, 7 Jan 2025 11:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736250652; bh=oz75zD4hz8TVndlevnw8+K50k+0vYc6T0yklKGuI40g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HkGu2ro89exC5pa9GZOxD3cgw80S2LW7nBfk7BHpKajgBtX9swz3ZrCCgQx3EqB+5 5YCfoBFieetNOGVRSc4qUgreOnJke31pnwjKlHdlQUYckEwH/T9m9RN4nkFnOAQsX/ XA7neyJIAe9rTptnFNDHDQt0swSN7G96KIb2iVMkAf1xHKmrJXk+cxKvdOt7rSUc7k jDtLUS+n2rVekO1PO0YzVEbx0aF9z6V+zItxNhcUkn8avzaVVwCpws4aSDxZuDROI+ LQMsgaX8dFyutIm03lo3RRw/+7EKbIMoG8bvqVBMSEt6CFhSenJFme2rYLCpvAfy+D O4mjhYB46tW3w== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Peter Zijlstra Cc: Anil S Keshavamurthy , Masami Hiramatsu , "David S . Miller" , Mathieu Desnoyers , Oleg Nesterov , Tzvetomir Stoyanov , Naveen N Rao , Josh Poimboeuf , Jason Baron , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v3 4/5] tracing/kprobes: Simplify __trace_kprobe_create() by removing gotos Date: Tue, 7 Jan 2025 20:50:46 +0900 Message-ID: <173625064678.1375434.12268197997262287477.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173625060316.1375434.11048027439794595989.stgit@devnote2> References: <173625060316.1375434.11048027439794595989.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Simplify __trace_kprobe_create() by removing gotos. Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_kprobe.c | 82 ++++++++++++++++++++++-----------------= ---- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 2d8b5ef47e96..f487473cf255 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -841,7 +841,8 @@ static int validate_probe_symbol(char *symbol) static int trace_kprobe_entry_handler(struct kretprobe_instance *ri, struct pt_regs *regs); =20 -static int __trace_kprobe_create(int argc, const char *argv[]) +static int ___trace_kprobe_create(int argc, const char *argv[], + struct traceprobe_parse_context *ctx) { /* * Argument syntax: @@ -882,7 +883,6 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) char gbuf[MAX_EVENT_NAME_LEN]; char abuf[MAX_BTF_ARGS_LEN]; char *dbuf __free(kfree) =3D NULL; - struct traceprobe_parse_context ctx =3D { .flags =3D TPARG_FL_KERNEL }; =20 switch (argv[0][0]) { case 'r': @@ -896,8 +896,6 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) if (argc < 2) return -ECANCELED; =20 - trace_probe_log_init("trace_kprobe", argc, argv); - event =3D strchr(&argv[0][1], ':'); if (event) event++; @@ -905,7 +903,7 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) if (isdigit(argv[0][1])) { if (!is_return) { trace_probe_log_err(1, BAD_MAXACT_TYPE); - goto parse_error; + return -EINVAL; } if (event) len =3D event - &argv[0][1] - 1; @@ -913,21 +911,21 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) len =3D strlen(&argv[0][1]); if (len > MAX_EVENT_NAME_LEN - 1) { trace_probe_log_err(1, BAD_MAXACT); - goto parse_error; + return -EINVAL; } memcpy(buf, &argv[0][1], len); buf[len] =3D '\0'; ret =3D kstrtouint(buf, 0, &maxactive); if (ret || !maxactive) { trace_probe_log_err(1, BAD_MAXACT); - goto parse_error; + return -EINVAL; } /* kretprobes instances are iterated over via a list. The * maximum should stay reasonable. */ if (maxactive > KRETPROBE_MAXACTIVE_MAX) { trace_probe_log_err(1, MAXACT_TOO_BIG); - goto parse_error; + return -EINVAL; } } =20 @@ -936,16 +934,13 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) if (kstrtoul(argv[1], 0, (unsigned long *)&addr)) { trace_probe_log_set_index(1); /* Check whether uprobe event specified */ - if (strchr(argv[1], '/') && strchr(argv[1], ':')) { - ret =3D -ECANCELED; - goto out; - } + if (strchr(argv[1], '/') && strchr(argv[1], ':')) + return -ECANCELED; + /* a symbol specified */ symbol =3D kstrdup(argv[1], GFP_KERNEL); - if (!symbol) { - ret =3D -ENOMEM; - goto error; - } + if (!symbol) + return -ENOMEM; =20 tmp =3D strchr(symbol, '%'); if (tmp) { @@ -954,7 +949,7 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) is_return =3D true; } else { trace_probe_log_err(tmp - symbol, BAD_ADDR_SUFFIX); - goto parse_error; + return -EINVAL; } } =20 @@ -962,7 +957,7 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) ret =3D traceprobe_split_symbol_offset(symbol, &offset); if (ret || offset < 0 || offset > UINT_MAX) { trace_probe_log_err(0, BAD_PROBE_ADDR); - goto parse_error; + return -EINVAL; } ret =3D validate_probe_symbol(symbol); if (ret) { @@ -970,17 +965,17 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) trace_probe_log_err(0, NON_UNIQ_SYMBOL); else trace_probe_log_err(0, BAD_PROBE_ADDR); - goto parse_error; + return -EINVAL; } if (is_return) - ctx.flags |=3D TPARG_FL_RETURN; + ctx->flags |=3D TPARG_FL_RETURN; ret =3D kprobe_on_func_entry(NULL, symbol, offset); if (ret =3D=3D 0 && !is_return) - ctx.flags |=3D TPARG_FL_FENTRY; + ctx->flags |=3D TPARG_FL_FENTRY; /* Defer the ENOENT case until register kprobe */ if (ret =3D=3D -EINVAL && is_return) { trace_probe_log_err(0, BAD_RETPROBE); - goto parse_error; + return -EINVAL; } } =20 @@ -989,7 +984,7 @@ static int __trace_kprobe_create(int argc, const char *= argv[]) ret =3D traceprobe_parse_event_name(&event, &group, gbuf, event - argv[0]); if (ret) - goto parse_error; + return ret; } =20 if (!event) { @@ -1005,26 +1000,24 @@ static int __trace_kprobe_create(int argc, const ch= ar *argv[]) } =20 argc -=3D 2; argv +=3D 2; - ctx.funcname =3D symbol; + ctx->funcname =3D symbol; new_argv =3D traceprobe_expand_meta_args(argc, argv, &new_argc, - abuf, MAX_BTF_ARGS_LEN, &ctx); + abuf, MAX_BTF_ARGS_LEN, ctx); if (IS_ERR(new_argv)) { ret =3D PTR_ERR(new_argv); new_argv =3D NULL; - goto out; + return ret; } if (new_argv) { argc =3D new_argc; argv =3D new_argv; } - if (argc > MAX_TRACE_ARGS) { - ret =3D -E2BIG; - goto out; - } + if (argc > MAX_TRACE_ARGS) + return -E2BIG; =20 ret =3D traceprobe_expand_dentry_args(argc, argv, &dbuf); if (ret) - goto out; + return ret; =20 /* setup a probe */ tk =3D alloc_trace_kprobe(group, event, addr, symbol, offset, maxactive, @@ -1033,16 +1026,16 @@ static int __trace_kprobe_create(int argc, const ch= ar *argv[]) ret =3D PTR_ERR(tk); /* This must return -ENOMEM, else there is a bug */ WARN_ON_ONCE(ret !=3D -ENOMEM); - goto out; /* We know tk is not allocated */ + return ret; /* We know tk is not allocated */ } =20 /* parse arguments */ for (i =3D 0; i < argc; i++) { trace_probe_log_set_index(i + 2); - ctx.offset =3D 0; - ret =3D traceprobe_parse_probe_arg(&tk->tp, i, argv[i], &ctx); + ctx->offset =3D 0; + ret =3D traceprobe_parse_probe_arg(&tk->tp, i, argv[i], ctx); if (ret) - goto out; /* This can be -ENOMEM */ + return ret; /* This can be -ENOMEM */ } /* entry handler for kretprobe */ if (is_return && tk->tp.entry_arg) { @@ -1053,7 +1046,7 @@ static int __trace_kprobe_create(int argc, const char= *argv[]) ptype =3D is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL; ret =3D traceprobe_set_print_fmt(&tk->tp, ptype); if (ret < 0) - goto out; + return ret; =20 ret =3D register_trace_kprobe(tk); if (ret) { @@ -1071,14 +1064,21 @@ static int __trace_kprobe_create(int argc, const ch= ar *argv[]) */ tk =3D NULL; =20 -out: + return ret; +} + +static int __trace_kprobe_create(int argc, const char *argv[]) +{ + struct traceprobe_parse_context ctx =3D { .flags =3D TPARG_FL_KERNEL }; + int ret; + + trace_probe_log_init("trace_kprobe", argc, argv); + + ret =3D ___trace_kprobe_create(argc, argv, &ctx); + traceprobe_finish_parse(&ctx); trace_probe_log_clear(); return ret; - -parse_error: - ret =3D -EINVAL; - goto out; } =20 static int trace_kprobe_create(const char *raw_command) From nobody Sat Feb 7 14:05:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDF971E1025; Tue, 7 Jan 2025 11:51:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250664; cv=none; b=mR/QWZMHck6ZvYY+wnJLxpUqwnOnEYBfrZwZZD5j3KDfT9j8CdQa6ooM8gcOS7pdj9xSLdWbople7iXhBVY/lzlbfC8nOfebMfo3n2Ya7cZIERhNLc8YZ1s6Xspt6gWNkaFMxDLtqn99tpzQbZnWNYb3N1fzMbKzBUE+3MMZw1c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736250664; c=relaxed/simple; bh=cWfM7pDjpnXkX6rzKo3buzt3QtdFFTEv3P6Y91fHmqs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=enEYuW4hVY4sXKjleed3ncRRV66XfxNET9dgulcqpVhM/ZZ9aJtdrCuW27rmwX2dGi1R25ULvrjFZZ3LMKXUEfurHT4cP0mrITMSsX6x/rIMVAcguZI4DVIj6qeFsTTq1RK44PDNjeXNHr/qn/hTB216iU4fehL+sa/DyqfM4GU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fznqSSyE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fznqSSyE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94B5DC4CED6; Tue, 7 Jan 2025 11:51:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736250663; bh=cWfM7pDjpnXkX6rzKo3buzt3QtdFFTEv3P6Y91fHmqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fznqSSyExQ+WOM4zWuIRdcDLGoEAD3R7WeP6qdrV01fskHdm6WOL+d20Ob8XCpkML XL1I475UMS5X+/E0SE6VWYRNEdUeBFcsC6Q2Ses+8gwHSnRLMQR4KwFdOhE5H8rsSk M11824tIC1SZ+CYClQ2Exgm72F5ON3SWrSyY6kJGvRsJwkk6RI6NubKTiaTqcMa16U fkEiuyIe9dzMkv8wIIt3VngE3hvr/QsQe/gJ0SRUX/zY/mxL79KKznEiFHl/A+3o9y t46YHSjabzn0/1kCfIJlj/6xKzvJ+otKD+ZIEyHAzbjGf5slJXL8RCM0QQcBX5J1y/ zFLjRogeE71oA== From: "Masami Hiramatsu (Google)" To: Steven Rostedt , Peter Zijlstra Cc: Anil S Keshavamurthy , Masami Hiramatsu , "David S . Miller" , Mathieu Desnoyers , Oleg Nesterov , Tzvetomir Stoyanov , Naveen N Rao , Josh Poimboeuf , Jason Baron , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v3 5/5] tracing: Adopt __free() and guard() for trace_fprobe.c Date: Tue, 7 Jan 2025 20:50:58 +0900 Message-ID: <173625065791.1375434.16522338116618817208.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173625060316.1375434.11048027439794595989.stgit@devnote2> References: <173625060316.1375434.11048027439794595989.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Adopt __free() and guard() for trace_fprobe.c to remove gotos. Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_fprobe.c | 129 ++++++++++++++++++++-------------------= ---- 1 file changed, 60 insertions(+), 69 deletions(-) diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c index c62d1629cffe..6d339c426b5d 100644 --- a/kernel/trace/trace_fprobe.c +++ b/kernel/trace/trace_fprobe.c @@ -379,6 +379,9 @@ static void free_trace_fprobe(struct trace_fprobe *tf) } } =20 +/* Since alloc_trace_fprobe() can return error, check the pointer is ERR t= oo. */ +DEFINE_FREE(trace_fprobe, struct trace_fprobe *, if (!IS_ERR_OR_NULL(_T)) = free_trace_fprobe(_T)) + /* * Allocate new trace_probe and initialize it (including fprobe). */ @@ -390,7 +393,7 @@ static struct trace_fprobe *alloc_trace_fprobe(const ch= ar *group, int maxactive, int nargs, bool is_return) { - struct trace_fprobe *tf; + struct trace_fprobe *tf __free(trace_fprobe) =3D NULL; int ret =3D -ENOMEM; =20 tf =3D kzalloc(struct_size(tf, tp.args, nargs), GFP_KERNEL); @@ -399,7 +402,7 @@ static struct trace_fprobe *alloc_trace_fprobe(const ch= ar *group, =20 tf->symbol =3D kstrdup(symbol, GFP_KERNEL); if (!tf->symbol) - goto error; + return ERR_PTR(-ENOMEM); =20 if (is_return) tf->fp.exit_handler =3D fexit_dispatcher; @@ -412,13 +415,10 @@ static struct trace_fprobe *alloc_trace_fprobe(const = char *group, =20 ret =3D trace_probe_init(&tf->tp, event, group, false, nargs); if (ret < 0) - goto error; + return ERR_PTR(ret); =20 dyn_event_init(&tf->devent, &trace_fprobe_ops); - return tf; -error: - free_trace_fprobe(tf); - return ERR_PTR(ret); + return_ptr(tf); } =20 static struct trace_fprobe *find_trace_fprobe(const char *event, @@ -845,14 +845,12 @@ static int register_trace_fprobe(struct trace_fprobe = *tf) struct trace_fprobe *old_tf; int ret; =20 - mutex_lock(&event_mutex); + guard(mutex)(&event_mutex); =20 old_tf =3D find_trace_fprobe(trace_probe_name(&tf->tp), trace_probe_group_name(&tf->tp)); - if (old_tf) { - ret =3D append_trace_fprobe(tf, old_tf); - goto end; - } + if (old_tf) + return append_trace_fprobe(tf, old_tf); =20 /* Register new event */ ret =3D register_fprobe_event(tf); @@ -862,7 +860,7 @@ static int register_trace_fprobe(struct trace_fprobe *t= f) trace_probe_log_err(0, EVENT_EXIST); } else pr_warn("Failed to register probe event(%d)\n", ret); - goto end; + return ret; } =20 /* Register fprobe */ @@ -872,8 +870,6 @@ static int register_trace_fprobe(struct trace_fprobe *t= f) else dyn_event_add(&tf->devent, trace_probe_event_call(&tf->tp)); =20 -end: - mutex_unlock(&event_mutex); return ret; } =20 @@ -1034,7 +1030,10 @@ static int parse_symbol_and_return(int argc, const c= har *argv[], return 0; } =20 -static int __trace_fprobe_create(int argc, const char *argv[]) +DEFINE_FREE(module_put, struct module *, if (_T) module_put(_T)) + +static int ___trace_fprobe_create(int argc, const char *argv[], + struct traceprobe_parse_context *ctx) { /* * Argument syntax: @@ -1060,24 +1059,21 @@ static int __trace_fprobe_create(int argc, const ch= ar *argv[]) * Type of args: * FETCHARG:TYPE : use TYPE instead of unsigned long. */ - struct trace_fprobe *tf =3D NULL; + struct trace_fprobe *tf __free(trace_fprobe) =3D NULL; int i, len, new_argc =3D 0, ret =3D 0; bool is_return =3D false; - char *symbol =3D NULL; + char *symbol __free(kfree) =3D NULL; const char *event =3D NULL, *group =3D FPROBE_EVENT_SYSTEM; - const char **new_argv =3D NULL; + const char **new_argv __free(kfree) =3D NULL; int maxactive =3D 0; char buf[MAX_EVENT_NAME_LEN]; char gbuf[MAX_EVENT_NAME_LEN]; char sbuf[KSYM_NAME_LEN]; char abuf[MAX_BTF_ARGS_LEN]; - char *dbuf =3D NULL; + char *dbuf __free(kfree) =3D NULL; bool is_tracepoint =3D false; - struct module *tp_mod =3D NULL; + struct module *tp_mod __free(module_put) =3D NULL; struct tracepoint *tpoint =3D NULL; - struct traceprobe_parse_context ctx =3D { - .flags =3D TPARG_FL_KERNEL | TPARG_FL_FPROBE, - }; =20 if ((argv[0][0] !=3D 'f' && argv[0][0] !=3D 't') || argc < 2) return -ECANCELED; @@ -1087,8 +1083,6 @@ static int __trace_fprobe_create(int argc, const char= *argv[]) group =3D TRACEPOINT_EVENT_SYSTEM; } =20 - trace_probe_log_init("trace_fprobe", argc, argv); - event =3D strchr(&argv[0][1], ':'); if (event) event++; @@ -1100,21 +1094,21 @@ static int __trace_fprobe_create(int argc, const ch= ar *argv[]) len =3D strlen(&argv[0][1]); if (len > MAX_EVENT_NAME_LEN - 1) { trace_probe_log_err(1, BAD_MAXACT); - goto parse_error; + return -EINVAL; } memcpy(buf, &argv[0][1], len); buf[len] =3D '\0'; ret =3D kstrtouint(buf, 0, &maxactive); if (ret || !maxactive) { trace_probe_log_err(1, BAD_MAXACT); - goto parse_error; + return -EINVAL; } /* fprobe rethook instances are iterated over via a list. The * maximum should stay reasonable. */ if (maxactive > RETHOOK_MAXACTIVE_MAX) { trace_probe_log_err(1, MAXACT_TOO_BIG); - goto parse_error; + return -EINVAL; } } =20 @@ -1123,12 +1117,12 @@ static int __trace_fprobe_create(int argc, const ch= ar *argv[]) /* a symbol(or tracepoint) must be specified */ ret =3D parse_symbol_and_return(argc, argv, &symbol, &is_return, is_trace= point); if (ret < 0) - goto parse_error; + return -EINVAL; =20 if (!is_return && maxactive) { trace_probe_log_set_index(0); trace_probe_log_err(1, BAD_MAXACT_TYPE); - goto parse_error; + return -EINVAL; } =20 trace_probe_log_set_index(0); @@ -1136,7 +1130,7 @@ static int __trace_fprobe_create(int argc, const char= *argv[]) ret =3D traceprobe_parse_event_name(&event, &group, gbuf, event - argv[0]); if (ret) - goto parse_error; + return -EINVAL; } =20 if (!event) { @@ -1152,49 +1146,44 @@ static int __trace_fprobe_create(int argc, const ch= ar *argv[]) } =20 if (is_return) - ctx.flags |=3D TPARG_FL_RETURN; + ctx->flags |=3D TPARG_FL_RETURN; else - ctx.flags |=3D TPARG_FL_FENTRY; + ctx->flags |=3D TPARG_FL_FENTRY; =20 if (is_tracepoint) { - ctx.flags |=3D TPARG_FL_TPOINT; + ctx->flags |=3D TPARG_FL_TPOINT; tpoint =3D find_tracepoint(symbol, &tp_mod); if (tpoint) { - ctx.funcname =3D kallsyms_lookup( + ctx->funcname =3D kallsyms_lookup( (unsigned long)tpoint->probestub, NULL, NULL, NULL, sbuf); } else if (IS_ENABLED(CONFIG_MODULES)) { /* This *may* be loaded afterwards */ tpoint =3D TRACEPOINT_STUB; - ctx.funcname =3D symbol; + ctx->funcname =3D symbol; } else { trace_probe_log_set_index(1); trace_probe_log_err(0, NO_TRACEPOINT); - goto parse_error; + return -EINVAL; } } else - ctx.funcname =3D symbol; + ctx->funcname =3D symbol; =20 argc -=3D 2; argv +=3D 2; new_argv =3D traceprobe_expand_meta_args(argc, argv, &new_argc, - abuf, MAX_BTF_ARGS_LEN, &ctx); - if (IS_ERR(new_argv)) { - ret =3D PTR_ERR(new_argv); - new_argv =3D NULL; - goto out; - } + abuf, MAX_BTF_ARGS_LEN, ctx); + if (IS_ERR(new_argv)) + return PTR_ERR(new_argv); if (new_argv) { argc =3D new_argc; argv =3D new_argv; } - if (argc > MAX_TRACE_ARGS) { - ret =3D -E2BIG; - goto out; - } + if (argc > MAX_TRACE_ARGS) + return -E2BIG; =20 ret =3D traceprobe_expand_dentry_args(argc, argv, &dbuf); if (ret) - goto out; + return ret; =20 /* setup a probe */ tf =3D alloc_trace_fprobe(group, event, symbol, tpoint, tp_mod, @@ -1203,16 +1192,16 @@ static int __trace_fprobe_create(int argc, const ch= ar *argv[]) ret =3D PTR_ERR(tf); /* This must return -ENOMEM, else there is a bug */ WARN_ON_ONCE(ret !=3D -ENOMEM); - goto out; /* We know tf is not allocated */ + return ret; } =20 /* parse arguments */ for (i =3D 0; i < argc; i++) { trace_probe_log_set_index(i + 2); - ctx.offset =3D 0; - ret =3D traceprobe_parse_probe_arg(&tf->tp, i, argv[i], &ctx); + ctx->offset =3D 0; + ret =3D traceprobe_parse_probe_arg(&tf->tp, i, argv[i], ctx); if (ret) - goto error; /* This can be -ENOMEM */ + return ret; /* This can be -ENOMEM */ } =20 if (is_return && tf->tp.entry_arg) { @@ -1223,7 +1212,7 @@ static int __trace_fprobe_create(int argc, const char= *argv[]) ret =3D traceprobe_set_print_fmt(&tf->tp, is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL); if (ret < 0) - goto error; + return ret; =20 ret =3D register_trace_fprobe(tf); if (ret) { @@ -1234,24 +1223,26 @@ static int __trace_fprobe_create(int argc, const ch= ar *argv[]) trace_probe_log_err(0, BAD_PROBE_ADDR); else if (ret !=3D -ENOMEM && ret !=3D -EEXIST) trace_probe_log_err(0, FAIL_REG_PROBE); - goto error; - } + ret =3D -EINVAL; + } else + /* 'tf' is successfully registered. To avoid freeing, assign NULL. */ + tf =3D NULL; =20 -out: - if (tp_mod) - module_put(tp_mod); + return ret; +} + +static int __trace_fprobe_create(int argc, const char *argv[]) +{ + struct traceprobe_parse_context ctx =3D { + .flags =3D TPARG_FL_KERNEL | TPARG_FL_FPROBE, + }; + int ret; + + trace_probe_log_init("trace_fprobe", argc, argv); + ret =3D ___trace_fprobe_create(argc, argv, &ctx); traceprobe_finish_parse(&ctx); trace_probe_log_clear(); - kfree(new_argv); - kfree(symbol); - kfree(dbuf); return ret; - -parse_error: - ret =3D -EINVAL; -error: - free_trace_fprobe(tf); - goto out; } =20 static int trace_fprobe_create(const char *raw_command)