From mboxrd@z Thu Jan 1 00:00:00 1970 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 8FC7E15B10D; Mon, 28 Oct 2024 06:43:37 +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=1730097817; cv=none; b=Nv6YF0iFsTjFdCnYSs4FOMbF59mY6p0mwqwMf2xWcDShDwTvS7ZZWN6AipVEuQMLgHvu6KyHsSDr71RT2+ycyHFKG8ATLX8eCRApj3O83JSo13I2wVniovJtJanauEbbujnWovH/a5mFqPun1WqRrmm22gmiLCMydVg0p3XFpvM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097817; c=relaxed/simple; bh=YtFGpKQzb7mgSF6joCvQA9GxHzMCp4YgwDi0yCzS4+Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RwFqC9LDqQvutn42VtzS65pT4G9WqXBMSSXzzWSa2aEpTACasK1DO2tAPEoJzYHqq/i0C9Y+l4uoz7mVEXogTkY68iQE+X5Rarcwa2BGoCpYwD1hf3/iV+B6YA2XydSIVcmTJkZsJNF8Cw6L+SlQH9Em8vrUDw/XK7yRY9+hDho= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yZYmC1E6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yZYmC1E6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 307F8C4CEC3; Mon, 28 Oct 2024 06:43:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730097817; bh=YtFGpKQzb7mgSF6joCvQA9GxHzMCp4YgwDi0yCzS4+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yZYmC1E6z0bjo0+Fn8uDH1ZIEjDrU2Ut+COn6gLCTM91DXn4m2Dvw6yN/dR21NxUA 3XBce98yJsX/gsmFnATo2aWX2TXhBr7rUc74a64e1MX/MX42zS/0gsmJ0WL7j9NQyF YVGi8YIrIENUfwGQVv03ebe8KtUvRT9sUm3z/TUY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Peter Zijlstra , Jiri Olsa , Andrii Nakryiko , Sasha Levin Subject: [PATCH 6.6 160/208] bpf,perf: Fix perf_event_detach_bpf_prog error handling Date: Mon, 28 Oct 2024 07:25:40 +0100 Message-ID: <20241028062310.568612113@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028062306.649733554@linuxfoundation.org> References: <20241028062306.649733554@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiri Olsa [ Upstream commit 0ee288e69d033850bc87abe0f9cc3ada24763d7f ] Peter reported that perf_event_detach_bpf_prog might skip to release the bpf program for -ENOENT error from bpf_prog_array_copy. This can't happen because bpf program is stored in perf event and is detached and released only when perf event is freed. Let's drop the -ENOENT check and make sure the bpf program is released in any case. Fixes: 170a7e3ea070 ("bpf: bpf_prog_array_copy() should return -ENOENT if exclude_prog not found") Reported-by: Peter Zijlstra Signed-off-by: Jiri Olsa Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20241023200352.3488610-1-jolsa@kernel.org Closes: https://lore.kernel.org/lkml/20241022111638.GC16066@noisy.programming.kicks-ass.net/ Signed-off-by: Sasha Levin --- kernel/trace/bpf_trace.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index ecc86a595b754..9064f75de7e46 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2217,8 +2217,6 @@ void perf_event_detach_bpf_prog(struct perf_event *event) old_array = bpf_event_rcu_dereference(event->tp_event->prog_array); ret = bpf_prog_array_copy(old_array, event->prog, NULL, 0, &new_array); - if (ret == -ENOENT) - goto unlock; if (ret < 0) { bpf_prog_array_delete_safe(old_array, event->prog); } else { -- 2.43.0