Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp360987pxb; Wed, 14 Apr 2021 17:50:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJza73cgAL1BCE54Tf3FpPm1+G2jhX0Eo1OaqkDh/k/2Z36NHFLsVu1b8XeLU0Q/MaxuQJni X-Received: by 2002:a17:906:cb11:: with SMTP id lk17mr729125ejb.517.1618447849873; Wed, 14 Apr 2021 17:50:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618447849; cv=none; d=google.com; s=arc-20160816; b=XWTlwEh+NdoXB+90Y3g+ScDko/t7RMYVhhzAjzrtWaCf2hDTkgRTf7cpa931N+SFcb zPgsrqIe9U9oFnz8RwpUppS0qSjWydyqXkQuR7IdtqudeW9rXnCtAZJjgLg1eRkb+kso BxpZODdVpeipTiGroiUBAqgEVP+Ujk8AzB/P1A1H7va2Yq1TKwDUA/dUoxE7TRwtPpRh 45f2G6m9USTXOO0fh56soIO2iTnXzOId/tXjCRa+ksf3LwqkAZ32m22pB/X6pMh0JY/3 w45o1DZGjCTtEpNxm2V6RkaEIJ+6Iz0q1+25CZ82q9ihS44E/yDFtOsnjPMI9PDfaRxq lpOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=3ngC+8CX71tyIhWsOpGPzwvs7zLSIxz8Pt7kSS42e2k=; b=paS4IbxkIovZGP/EoaE6J1+flhP8U1Qa56Ky8DTWHb3maPKPwzkEWoB3S3ZPdxnBY2 74l1rDJURi7KheNvxUWWExd0yk5i8mbv26K6NkTNBpH/6DRmE6lMKeHxmOeB+5o+H17P 63GNq82k9hAinz3H/yGlGHl5/0L43QyUFz/JPO3VXFOm2BELKU7S8xfWNYGf7K5b57Cx 1zP2MOjegKgTLaYshivl6Ak/S7HRD3qI3qBhddCFCmaHakTsbTRzhpLOfwvAWofWVfYZ xcr3oxwQqakMIMQdqWdA9JHRZWb6jag9unZM/5+SrLppk9wfRkz0CPyNchg5+tt2aEw9 2Vww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=J177bevi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nc38si953906ejc.362.2021.04.14.17.50.26; Wed, 14 Apr 2021 17:50:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=J177bevi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233001AbhDNVYu (ORCPT + 99 others); Wed, 14 Apr 2021 17:24:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231280AbhDNVYs (ORCPT ); Wed, 14 Apr 2021 17:24:48 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B3A4C061574 for ; Wed, 14 Apr 2021 14:24:26 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id j32so592037pgm.6 for ; Wed, 14 Apr 2021 14:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3ngC+8CX71tyIhWsOpGPzwvs7zLSIxz8Pt7kSS42e2k=; b=J177beviUVuOGpGcCJ5ILLC8BAqSTgHSCi83UiYgqNvmhvvXq9Ll0CNa/4zxWdmccz 62g9CYE9XGHeeRMKyepM3wZVh/bvOgkGLIH9TL2O/VMPQ4WOM4p036ijeZ8X3SlTyxrX dNCnXnmuFjgiXaaO353cmbhhE6fTGFIQbk1mEwwYWyRukzNBkRDwvngMEo85vYc7p4GN RHb9vxDY1SdBgnZ+MgO8fEZWDytSFmh4FHCCMP5N0ca0j6BSTQD/KbC5w3VYHUaa5fZm zsqMBBldmTt7393lYAerwlkuu5/ulbdoIcKHqaxIY61x/Ge6caHlg47Jz9FHplqfN1zw AVjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3ngC+8CX71tyIhWsOpGPzwvs7zLSIxz8Pt7kSS42e2k=; b=UYKIIbTKBfDrRwp3RvJ1KHnzp2JLKMSPUNuyweyEZQr5iQKYhUeZ/G1pikaqLEubLf l8BnZrHWAzk/EUGREKbFSL1ZDJ1dPX3IPG67Qb0jtz1CkAQlk1+4yycj7HUbebdRGzX5 BJWxoM/stmr9FRRBDWmyLja7aIvwYDxCEeAOnjfFM4QafQgS6g+9IT/3nLmrRGbXOHgU gfqOIN9VTwhypHF2w9jWF6Fpff15JvdWEXN9zvX/L28SuvHeAMpwPZEnEdX2J6/oczty OxGiKfeh17YagyoJ3WJlyOW90f4fx9YEKXrRjKZSwuAb00AL7Qbh7wPfglUjB5vEaBt3 65/Q== X-Gm-Message-State: AOAM531N7CvmKqxhoO4sHd3DR9HuoiBq9tDIGlPPYyzuiMGN0ZhInEKS sQ7c1GKuPpBv2kcXxbMiyGY= X-Received: by 2002:a63:360b:: with SMTP id d11mr275723pga.297.1618435465809; Wed, 14 Apr 2021 14:24:25 -0700 (PDT) Received: from shuochen.svl.corp.google.com ([2620:15c:2c5:11:709c:3913:46a6:a31]) by smtp.gmail.com with ESMTPSA id gd13sm260487pjb.56.2021.04.14.14.24.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 14:24:25 -0700 (PDT) From: Shuo Chen To: Jim Cromie , Jason Baron , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Shuo Chen Subject: [PATCH] dyndbg: fix parsing file query without a line-range suffix Date: Wed, 14 Apr 2021 14:24:00 -0700 Message-Id: <20210414212400.2927281-1-giantchen@gmail.com> X-Mailer: git-send-email 2.31.1.295.g9ea45b61b8-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shuo Chen Query like 'file tcp_input.c line 1234 +p' was broken by commit aaebe329bff0 ("dyndbg: accept 'file foo.c:func1' and 'file foo.c:10-100'") because a file name without a ':' now makes the loop in ddebug_parse_query() exits early before parsing the 'line 1234' part. As a result, all pr_debug() in tcp_input.c will be enabled, instead of only the one on line 1234. Changing 'break' to 'continue' fixes this. Fixes: aaebe329bff0 ("dyndbg: accept 'file foo.c:func1' and 'file foo.c:10-100'") Signed-off-by: Shuo Chen --- lib/dynamic_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index c70d6347afa2..921d0a654243 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -396,7 +396,7 @@ static int ddebug_parse_query(char *words[], int nwords, /* tail :$info is function or line-range */ fline = strchr(query->filename, ':'); if (!fline) - break; + continue; *fline++ = '\0'; if (isalpha(*fline) || *fline == '*' || *fline == '?') { /* take as function name */ -- 2.31.1.295.g9ea45b61b8-goog