From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758215AbdEMTdG (ORCPT ); Sat, 13 May 2017 15:33:06 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:41351 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757070AbdEMTcU (ORCPT ); Sat, 13 May 2017 15:32:20 -0400 From: "Naveen N. Rao" To: Steven Rostedt , Shuah Khan Cc: Michael Ellerman , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH 1/4] ftrace: Simplify glob handling in unregister_ftrace_function_probe_func() Date: Sun, 14 May 2017 01:01:01 +0530 X-Mailer: git-send-email 2.12.2 In-Reply-To: References: In-Reply-To: References: X-TM-AS-MML: disable x-cbid: 17051319-0008-0000-0000-0000012C299D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051319-0009-0000-0000-0000095ACAA2 Message-Id: <95a1ae9c5dc472fa8b23c0f2ce0ad8276f35d30e.1494702964.git.naveen.n.rao@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-13_10:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705130340 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Handle a NULL glob properly. Signed-off-by: Naveen N. Rao --- kernel/trace/ftrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 39dca4e86a94..28dc824ad072 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -4144,9 +4144,9 @@ unregister_ftrace_function_probe_func(char *glob, struct trace_array *tr, int i, ret = -ENODEV; int size; - if (glob && (strcmp(glob, "*") == 0 || !strlen(glob))) + if (!glob || (glob && (strcmp(glob, "*") == 0 || !strlen(glob)))) func_g.search = NULL; - else if (glob) { + else { int not; func_g.type = filter_parse_regex(glob, strlen(glob), -- 2.12.2