From patchwork Sun Apr 17 18:56:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ammar Faizi X-Patchwork-Id: 12816095 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 38A75C433EF for ; Sun, 17 Apr 2022 18:57:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234878AbiDQS7j (ORCPT ); Sun, 17 Apr 2022 14:59:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234876AbiDQS7i (ORCPT ); Sun, 17 Apr 2022 14:59:38 -0400 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C1D635877; Sun, 17 Apr 2022 11:57:02 -0700 (PDT) Received: from integral2.. (unknown [36.80.217.41]) by gnuweeb.org (Postfix) with ESMTPSA id CD9D17E3BA; Sun, 17 Apr 2022 18:56:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1650221821; bh=RFtg7BoSogQqJ3qbQ59LPrzum9EvKnWpLcNv0rGtvq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cqHbTrLAEbwlpZUNB52HM3REYAh3Vg6BVvtWRrGWcCn3b/+Rdd1582v5khnfX3+D6 RTgo/tCZ8fVu7ezeYhY/seTU28SSIHYjJYvVEPUEZ4Um68TCUYcKR9hBmU3jSqwqlV om+uCh1u/EkwJyxzMCKg0l5Zvcr8XvwnSr3QuzdsQfR+z4chfFWvqsyfUzpfOZ97jD KonQKsW9nojWeqZ+OZwMftBynbjx2d1FmTkgD/96nQa8tKruNz8wlCw0GIYugmxO7w 9O2R9lj79n5kmE8qHAFdh9/Ychv3JoUI4Uq4eP4IR626zmMN87Xfvm6mBZZlqpoPj/ qKKHTPTUR/3Gg== From: Ammar Faizi To: Steven Rostedt , Ingo Molnar Cc: Ammar Faizi , GNU/Weeb Mailing List , Linux Kernel Mailing List , Linux Trace Devel Mailing List Subject: [RESEND PATCH 1/2] tracing: Return -EINVAL if WARN_ON(!glob) triggered in event_hist_trigger_parse() Date: Mon, 18 Apr 2022 01:56:29 +0700 Message-Id: <20220417185630.199062-2-ammarfaizi2@gnuweeb.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220417185630.199062-1-ammarfaizi2@gnuweeb.org> References: <20220417185630.199062-1-ammarfaizi2@gnuweeb.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org If `WARN_ON(!glob)` is ever triggered, we will still continue executing the next lines. This will trigger the more serious problem, a NULL pointer dereference bug. Just return -EINVAL if @glob is NULL. Signed-off-by: Ammar Faizi --- kernel/trace/trace_events_hist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 44db5ba9cabb..0b99ad68e3fa 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -6186,7 +6186,8 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops, lockdep_assert_held(&event_mutex); - WARN_ON(!glob); + if (WARN_ON(!glob)) + return -EINVAL; if (strlen(glob)) { hist_err_clear();