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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 948B6C43381 for ; Thu, 14 Mar 2019 04:30:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E7E42184D for ; Thu, 14 Mar 2019 04:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552537857; bh=rJr9CO2gbIo3u4eMVEbCUuFTuhvs3gvXoiMeQ1MSEtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RX3TmimNd9piVvTWXnZL5iw4lFxsB9S20uFqWUqYlvcG9YeuAuQwP3IxuAxmP96O/ ejDCd5QLuXI6x4wQlwjgUMrDm6E/Byx+JKZrWuyZ9iMSqM42zb3VHU6EuNQ159aRRX XXbbOFEbfSEJPsRoDbE6lgyb8A8bNI9U1LvfmPYU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727183AbfCNEa4 (ORCPT ); Thu, 14 Mar 2019 00:30:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:47800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727093AbfCNEaz (ORCPT ); Thu, 14 Mar 2019 00:30:55 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 35FA12085A; Thu, 14 Mar 2019 04:30:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552537855; bh=rJr9CO2gbIo3u4eMVEbCUuFTuhvs3gvXoiMeQ1MSEtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YQRJNHmKgplTaMftl/8lBZExjZFORti+8VQsGix7kR+lVB0WG5+PRk6fhkuBgET+2 u7oi0COW+dNin9UbyNrUbdVwuW5VwgUsIBleZMB1pw3TDzadyFOBE7vPHEaPTy/dtn oYSmcBy2uzMwzvoXlDE/Ejh3vHthpqrJRDg3ktng= From: Masami Hiramatsu To: Tom Zanussi , Steven Rostedt Cc: tglx@linutronix.de, mhiramat@kernel.org, namhyung@kernel.org, bigeasy@linutronix.de, joel@joelfernandes.org, linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org Subject: [RFC PATCH v2 5/7] tracing/probe: Verify alloc_trace_*probe() result Date: Thu, 14 Mar 2019 13:30:50 +0900 Message-Id: <155253785078.14922.16902223633734601469.stgit@devnote2> X-Mailer: git-send-email 2.17.1 In-Reply-To: <155253778926.14922.14048967363017104338.stgit@devnote2> References: <155253778926.14922.14048967363017104338.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since alloc_trace_*probe() returns -EINVAL only if !event && !group, it should not happen in trace_*probe_create(). If we catch that case there is a bug. So use WARN_ON_ONCE() instead of pr_info(). Signed-off-by: Masami Hiramatsu --- kernel/trace/trace_kprobe.c | 4 ++-- kernel/trace/trace_uprobe.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 5222fd82e7e4..56324c231688 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -693,9 +693,9 @@ static int trace_kprobe_create(int argc, const char *argv[]) tk = alloc_trace_kprobe(group, event, addr, symbol, offset, maxactive, argc, is_return); if (IS_ERR(tk)) { - pr_info("Failed to allocate trace_probe.(%d)\n", - (int)PTR_ERR(tk)); ret = PTR_ERR(tk); + /* This must return -ENOMEM otherwise there is a bug */ + WARN_ON_ONCE(ret != -ENOMEM); goto out; } diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 52f033489377..b54137ec7810 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -514,8 +514,9 @@ static int trace_uprobe_create(int argc, const char **argv) tu = alloc_trace_uprobe(group, event, argc, is_return); if (IS_ERR(tu)) { - pr_info("Failed to allocate trace_uprobe.(%d)\n", (int)PTR_ERR(tu)); ret = PTR_ERR(tu); + /* This must return -ENOMEM otherwise there is a bug */ + WARN_ON_ONCE(ret != -ENOMEM); goto fail_address_parse; } tu->offset = offset;