From nobody Wed Dec 24 10:06:12 2025 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 5B34EFC0E; Mon, 29 Jan 2024 03:25:24 +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=1706498724; cv=none; b=XCveUON2mFMM5MdkN15eYBc0LWQLhoOypGmznd4F3g5lwBuPbOCLICh0XwV4MKo0y0vCapxFmdSYXcJMzMnMLGDHY4pFcSigHewGcv5pQOra2wwju6W8WHVGLyW9w/KHYsznsUjvs4M0TsYJt3hMf0E9wcUsafdz3kf4iV9m+yg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706498724; c=relaxed/simple; bh=cQZnw0XY6CFlQ+Z4GEoHFMmClO2ao+MY79xo8Dq099I=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=GbLg7nsnyR2N9+ugBriWUXmmwIkee3IoVUH5jJ2Cl7wLzWTgWGYzpjLCG98ZlNxTS3Qwdyzx5dv5jd9BbeGUAABMnEIDUfZVkk2pXuwP34UMhuCBi02PMCqW/CZ6q8M+wFQF4it8JGg3GE+KJqhsXunXeRK/fJMZAD/lcSj5osw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05DE5C41679; Mon, 29 Jan 2024 03:25:24 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rUIH6-00000004Fr1-40QR; Sun, 28 Jan 2024 22:25:32 -0500 Message-ID: <20240129032532.819040059@goodmis.org> User-Agent: quilt/0.67 Date: Sun, 28 Jan 2024 22:25:08 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , stable@vger.kernel.org, Vincent Donnefort Subject: [for-linus][PATCH 1/2] tracing/trigger: Fix to return error if failed to alloc snapshot References: <20240129032507.290291577@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Masami Hiramatsu (Google)" Fix register_snapshot_trigger() to return error code if it failed to allocate a snapshot instead of 0 (success). Unless that, it will register snapshot trigger without an error. Link: https://lore.kernel.org/linux-trace-kernel/170622977792.270660.278929= 8642759362200.stgit@devnote2 Fixes: 0bbe7f719985 ("tracing: Fix the race between registering 'snapshot' = event trigger and triggering 'snapshot' operation") Cc: stable@vger.kernel.org Cc: Vincent Donnefort Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_trigger.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_event= s_trigger.c index 46439e3bcec4..b33c3861fbbb 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -1470,8 +1470,10 @@ register_snapshot_trigger(char *glob, struct event_trigger_data *data, struct trace_event_file *file) { - if (tracing_alloc_snapshot_instance(file->tr) !=3D 0) - return 0; + int ret =3D tracing_alloc_snapshot_instance(file->tr); + + if (ret < 0) + return ret; =20 return register_trigger(glob, data, file); } --=20 2.43.0