From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7F32EB64DC for ; Fri, 21 Jul 2023 16:17:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232562AbjGUQRE (ORCPT ); Fri, 21 Jul 2023 12:17:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232569AbjGUQQo (ORCPT ); Fri, 21 Jul 2023 12:16:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7843044A1 for ; Fri, 21 Jul 2023 09:15:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 58B7161D26 for ; Fri, 21 Jul 2023 16:15:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65CDAC433C8; Fri, 21 Jul 2023 16:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689956143; bh=j+lhCQDjnFl3aEG4Bo/KFDm6e3CaRFvxMWFYY88P/MM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g56F9J/mGoWHvI9UfUIn4+z3Cc5OzV6ADK2qExDU/2H5e9peJ4lOQeSxjuUpciq0s AV6T3X/DQ90KausPEzlsW+c/ZFTnw0v6a72dXV/6Jrnw9pya4k1HGcoMqYwBIDFfXA IPCH25F3abWOcmfLkq/eE0ZHYa2T3E4a/A9qhMK0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Beau Belgrave , sunliming , "Steven Rostedt (Google)" Subject: [PATCH 6.4 140/292] tracing/user_events: Fix incorrect return value for writing operation when events are disabled Date: Fri, 21 Jul 2023 18:04:09 +0200 Message-ID: <20230721160534.871438682@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230721160528.800311148@linuxfoundation.org> References: <20230721160528.800311148@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: sunliming commit f6d026eea390d59787a6cdc2ef5c983d02e029d0 upstream. The writing operation return the count of writes regardless of whether events are enabled or disabled. Switch it to return -EBADF to indicates that the event is disabled. Link: https://lkml.kernel.org/r/20230626111344.19136-2-sunliming@kylinos.cn Cc: stable@vger.kernel.org 7f5a08c79df35 ("user_events: Add minimal support for trace_event into ftrace") Acked-by: Beau Belgrave Signed-off-by: sunliming Signed-off-by: Steven Rostedt (Google) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace_events_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -2096,7 +2096,8 @@ static ssize_t user_events_write_core(st if (unlikely(faulted)) return -EFAULT; - } + } else + return -EBADF; return ret; }