From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752865AbdJGOPg (ORCPT ); Sat, 7 Oct 2017 10:15:36 -0400 Received: from mout.web.de ([212.227.17.12]:59935 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbdJGOPe (ORCPT ); Sat, 7 Oct 2017 10:15:34 -0400 To: kernel-janitors@vger.kernel.org, Ingo Molnar , Steven Rostedt Cc: LKML From: SF Markus Elfring Subject: [PATCH] kernel/trace: Delete five error messages for a failed memory allocation Message-ID: Date: Sat, 7 Oct 2017 16:15:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:XZLoDfHgw/Nw5C1Uw+LZz36DqF4MPOvYY2VPsJD2p19kypDCauq hCZlWVoxDiZauQghwyU0wom6OkW9rmCMY0eLGmlcKp6icCbPFy4/8e+2WZZfzstRUGepHnF BTi0e6RaQSNudPAdEL1txtau13GuugZ4WeCUnQvdCOFcdsQLwSyYL6QaIJXhR5KzdJjTO3q RIhDwfozcmCYTJ9CNn5jQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:Atyh5BihI3M=:qcPdVxgLqnGOGuIxW6VqeM WIuPKp7/34+ojE/eFPXavQPi8wsIGYBfmJ188qvajUtSL9GN7D+nDfcsC374nvq6YQtfinYAQ bFrxjZxIdYmnFUDrlqKYliG/5ZSj9LoRpubJE1/9SxGLtuYhhY+4aoN114FuUBudGlVmyaU7a Yl1ZGKzAtyy+hHL3HWyiitQ/7Jyidz1nWEPGAP1eG3AkgeFByo83JTqSiKSel2khTr9dti0Oz LhpPY+qRwUBLsDKZ8uY5D4phZkfLFi1EKA08ek+jMlxdTGGdGV1gDpmzaqzCbT0jL1vaKHP0B h5IDJ2jvIuohCR4THaPs9NHSuzXePQBUFljNzB0GVfnsNVrgCXPXdcD4wa3HzsyN5S1q7z0VH P/jwwOx1jdGNEyi8XwMhyk+WFymGcAZ1FCAaaZAD2kiSSRId7SkQZPBDXQthxcpsxXP7mdYWN U3R6N7pg6diJemDWTt/vTAtNWo3ZBudXgfAd8s39PKI1EO2PqZbkch6pNsHEvBuaeRG+nRjtW yUBuUhtMBnbJ68LJHjEIJM3xLfSg61WLgPZbV7tZSWozm5FW7QfHhOZYxdT5aFof3m3ndsGIh huAqRRZU/rjdT/KSeAZEwYyIb6kpuNlXmfRF0M2D5lirRQwv5nrLmVa4xhmyeUpePKzTZA5q1 qgUtfAVAig8/AlrtLvFUs9EtChr2T6uXEQnhgSf3hbuIPbN69vv/E6e98FTGmyA9f7ZNOGhqO Vi7UE4H9d5MuBM3c3NgazQu1Qy00qHQJ0zoSBLY1nUPbf2iiIur/uvGVoU1iDZjZeWeLKv4CL LJTpCQyyIiF7BjvIKAAKCS7hTC1mfsns8aXbL7DtR3UTqDYn30= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 7 Oct 2017 16:10:06 +0200 Omit extra messages for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- kernel/trace/trace_kprobe.c | 1 - kernel/trace/trace_probe.c | 5 ++--- kernel/trace/trace_selftest.c | 4 +--- kernel/trace/trace_uprobe.c | 2 -- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 8a907e12b6b9..79a2ee2fc1f4 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -776,7 +776,6 @@ static int create_trace_kprobe(int argc, char **argv) } if (!parg->name) { - pr_info("Failed to allocate argument[%d] name.\n", i); ret = -ENOMEM; goto error; } diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 52478f033f88..cf544d899eaa 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -545,10 +545,9 @@ int traceprobe_parse_probe_arg(char *arg, ssize_t *size, return -ENOSPC; } parg->comm = kstrdup(arg, GFP_KERNEL); - if (!parg->comm) { - pr_info("Failed to allocate memory for command '%s'.\n", arg); + if (!parg->comm) return -ENOMEM; - } + t = strchr(parg->comm, ':'); if (t) { arg[t - parg->comm] = '\0'; diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index cb917cebae29..6a2a57def182 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c @@ -250,10 +250,8 @@ static int trace_selftest_ops(struct trace_array *tr, int cnt) /* Add a dynamic probe */ dyn_ops = kzalloc(sizeof(*dyn_ops), GFP_KERNEL); - if (!dyn_ops) { - printk("MEMORY ERROR "); + if (!dyn_ops) goto out; - } dyn_ops->func = trace_selftest_test_dyn_func; diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 4525e0271a53..9131f7372502 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -492,7 +492,6 @@ static int create_trace_uprobe(int argc, char **argv) tu->filename = kstrdup(filename, GFP_KERNEL); if (!tu->filename) { - pr_info("Failed to allocate filename.\n"); ret = -ENOMEM; goto error; } @@ -518,7 +517,6 @@ static int create_trace_uprobe(int argc, char **argv) } if (!parg->name) { - pr_info("Failed to allocate argument[%d] name.\n", i); ret = -ENOMEM; goto error; } -- 2.14.2