From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755590AbaKPTWd (ORCPT ); Sun, 16 Nov 2014 14:22:33 -0500 Received: from mout.web.de ([212.227.15.4]:54495 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751353AbaKPTWa (ORCPT ); Sun, 16 Nov 2014 14:22:30 -0500 Message-ID: <5468F96E.4090903@users.sourceforge.net> Date: Sun, 16 Nov 2014 20:22:22 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Ingo Molnar , Steven Rostedt CC: LKML , kernel-janitors@vger.kernel.org, Coccinelle Subject: [PATCH v2 2/2] kernel-trace: Less calls for iput() in create_trace_uprobe() after error detection References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <5468ABBD.6000903@users.sourceforge.net> <5468F756.8070807@users.sourceforge.net> In-Reply-To: <5468F756.8070807@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:IxeN2SwDXcykBrW+F4HIIxz6AegzB78veeqetGvM3Cqg2Y9uJFo KWeIlgHm07VxoPLsixU5z2dmMxEcckJQEZA3nqe+/n1HYSyGU/OH9Q/8M2oVv8rrviKP2hu khajAH6asIeWs1zX+/12marvJ8M4zOfMqxaYVy1Jni7IHD0Ju6jTnDDo69SDgyTvxBaIhoJ B60DFYIlhv7dZdYCMtLpg== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 16 Nov 2014 19:49:39 +0100 The iput() function was called in three cases by the create_trace_uprobe() function during error handling even if the passed variable contained still a null pointer. This implementation detail could be improved by the introduction of another jump label. Suggested-by: Julia Lawall Signed-off-by: Markus Elfring --- kernel/trace/trace_uprobe.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index ec002c0..a0288f2 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -434,19 +434,24 @@ static int create_trace_uprobe(int argc, char **argv) arg = strchr(argv[1], ':'); if (!arg) { ret = -EINVAL; - goto fail_address_parse; + goto fail_address_parse2; } *arg++ = '\0'; filename = argv[1]; ret = kern_path(filename, LOOKUP_FOLLOW, &path); if (ret) - goto fail_address_parse; + goto fail_address_parse2; inode = igrab(path.dentry->d_inode); path_put(&path); - if (!inode || !S_ISREG(inode->i_mode)) { + if (!inode) { + ret = -EINVAL; + goto fail_address_parse2; + } + + if (!S_ISREG(inode->i_mode)) { ret = -EINVAL; goto fail_address_parse; } @@ -554,6 +559,7 @@ error: fail_address_parse: iput(inode); +fail_address_parse2: pr_info("Failed to parse address or file.\n"); return ret; -- 2.1.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sun, 16 Nov 2014 19:22:22 +0000 Subject: [PATCH v2 2/2] kernel-trace: Less calls for iput() in create_trace_uprobe() after error detection Message-Id: <5468F96E.4090903@users.sourceforge.net> List-Id: References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <5468ABBD.6000903@users.sourceforge.net> <5468F756.8070807@users.sourceforge.net> In-Reply-To: <5468F756.8070807@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: cocci@systeme.lip6.fr From: Markus Elfring Date: Sun, 16 Nov 2014 19:49:39 +0100 The iput() function was called in three cases by the create_trace_uprobe() function during error handling even if the passed variable contained still a null pointer. This implementation detail could be improved by the introduction of another jump label. Suggested-by: Julia Lawall Signed-off-by: Markus Elfring --- kernel/trace/trace_uprobe.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index ec002c0..a0288f2 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -434,19 +434,24 @@ static int create_trace_uprobe(int argc, char **argv) arg = strchr(argv[1], ':'); if (!arg) { ret = -EINVAL; - goto fail_address_parse; + goto fail_address_parse2; } *arg++ = '\0'; filename = argv[1]; ret = kern_path(filename, LOOKUP_FOLLOW, &path); if (ret) - goto fail_address_parse; + goto fail_address_parse2; inode = igrab(path.dentry->d_inode); path_put(&path); - if (!inode || !S_ISREG(inode->i_mode)) { + if (!inode) { + ret = -EINVAL; + goto fail_address_parse2; + } + + if (!S_ISREG(inode->i_mode)) { ret = -EINVAL; goto fail_address_parse; } @@ -554,6 +559,7 @@ error: fail_address_parse: iput(inode); +fail_address_parse2: pr_info("Failed to parse address or file.\n"); return ret; -- 2.1.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: elfring@users.sourceforge.net (SF Markus Elfring) Date: Sun, 16 Nov 2014 20:22:22 +0100 Subject: [Cocci] [PATCH v2 2/2] kernel-trace: Less calls for iput() in create_trace_uprobe() after error detection In-Reply-To: <5468F756.8070807@users.sourceforge.net> References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <5468ABBD.6000903@users.sourceforge.net> <5468F756.8070807@users.sourceforge.net> Message-ID: <5468F96E.4090903@users.sourceforge.net> To: cocci@systeme.lip6.fr List-Id: cocci@systeme.lip6.fr From: Markus Elfring Date: Sun, 16 Nov 2014 19:49:39 +0100 The iput() function was called in three cases by the create_trace_uprobe() function during error handling even if the passed variable contained still a null pointer. This implementation detail could be improved by the introduction of another jump label. Suggested-by: Julia Lawall Signed-off-by: Markus Elfring --- kernel/trace/trace_uprobe.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index ec002c0..a0288f2 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -434,19 +434,24 @@ static int create_trace_uprobe(int argc, char **argv) arg = strchr(argv[1], ':'); if (!arg) { ret = -EINVAL; - goto fail_address_parse; + goto fail_address_parse2; } *arg++ = '\0'; filename = argv[1]; ret = kern_path(filename, LOOKUP_FOLLOW, &path); if (ret) - goto fail_address_parse; + goto fail_address_parse2; inode = igrab(path.dentry->d_inode); path_put(&path); - if (!inode || !S_ISREG(inode->i_mode)) { + if (!inode) { + ret = -EINVAL; + goto fail_address_parse2; + } + + if (!S_ISREG(inode->i_mode)) { ret = -EINVAL; goto fail_address_parse; } @@ -554,6 +559,7 @@ error: fail_address_parse: iput(inode); +fail_address_parse2: pr_info("Failed to parse address or file.\n"); return ret; -- 2.1.3