From patchwork Wed Oct 18 17:05:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 154991 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4939192vqb; Wed, 18 Oct 2023 10:07:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWE2hsmfjl+wuuuB2RZU1eJ/ItAL2W+uNrF7PJncEi1nNlocRm4w3yCmr4jmmuQPd3Gypq X-Received: by 2002:a17:902:d490:b0:1ca:1c89:9adb with SMTP id c16-20020a170902d49000b001ca1c899adbmr6400706plg.51.1697648862583; Wed, 18 Oct 2023 10:07:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697648862; cv=none; d=google.com; s=arc-20160816; b=xOVDvi4LsPlXXs/1Ahs98EJX/8QvdIiZS1AWPldXJZy91VX06MG7/bBjajVPJrXSbD yCphqnOH2VxwCTmQyb7tGMS+RbQd4uo5BBe1VdZ8o3+bQXkd7n7cR3Tce0UHPOilUNjw ZazPeBSpiR/Hs5sHWB7IKz1EoRYkg1IorldRANbscFOC/JyRMVe6x2KYB+0lr6WCxq/l XBG3/TeMK1GLuF9/gwvs5sevV+QMaNwphnMa99uq2Eav8xPJfjJHX+XsZmengVJs0FBx lL/qubCOjhmEsYBYPrFadc9QnCHgsePc/0nO6q/IWCVctfGhNUbBvuZtBlYY5SCxvbN2 Mplw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jF8ZuY1M1o6SHHQ3gYRaaYnGIssRMD3RHl4cqnyzMiQ=; fh=dD4hpA3+YqlszWEwFTO+ADczjyhU7P27niWnWgZXhCU=; b=hd/BegVa8boh02HhYe71mT2HYAsmG+9OXtN/ZB7+zDg2Ld4iSCyulO+S45jpi1tLIj YHTL6AhbYg3DB1DIsHF86rFxx6WUsN1GQQ5SW6M+iunnr2HZGKs4VFl/Ywxs3/7oculi iAQUOo1K4cHhP002ob+raaXLFskuUyrdSNVcDqqCSgem/AWYOXC4nv/XCFbT111ykAvX AbKDI7Lqf4DnHzoAUclD0V13DShK8gxN4VDvvTjT0wqxP89NL2at6vFVp54y2w9Zus3m lFgjghr6DPm6rIKQEDx64uggKsbXLFU4UXPoDiQCgaLIdKdiMFDiYxg7lLAE9V1NlUV7 Pfig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iYwe9oSW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id d6-20020a170903230600b001c9d7a75ab9si273950plh.444.2023.10.18.10.07.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 10:07:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iYwe9oSW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5D39080A7E69; Wed, 18 Oct 2023 10:07:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231970AbjJRRHC (ORCPT + 24 others); Wed, 18 Oct 2023 13:07:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231687AbjJRRGc (ORCPT ); Wed, 18 Oct 2023 13:06:32 -0400 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBEBA139; Wed, 18 Oct 2023 10:06:23 -0700 (PDT) Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-7a67f447bf0so13954639f.2; Wed, 18 Oct 2023 10:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697648783; x=1698253583; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jF8ZuY1M1o6SHHQ3gYRaaYnGIssRMD3RHl4cqnyzMiQ=; b=iYwe9oSWsVnvEs8+ZK3hJuiYo7+RAhzt7CZBvhFKrnfFzU6glGCZNeBQkcD9zQnbZw NTjYbJ+FH7vVlqO9wTaRQpWGOZ2fG/HkCC+gkvUwHCdlr3nofW4ORWqmlEpToP4WFMXr S6oXTMYGh9WMIP/MieFzXkI/Qkr9p5GAEmHoaWaBZGJnhv5oFDUFozKODEGLtkVzGEZy g4nda7mhXiDivxtKm3VQXIeKLG8toSgZxWNvQvceca4kiVrliPuk01MazlK9ss/R65aB D8Ww6tlYDPPUsw+zV4WNsiZmKhwLh3NUNturjdd4XrsV4q9YjsHo63xGxibDZjaShIRR 7bzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697648783; x=1698253583; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jF8ZuY1M1o6SHHQ3gYRaaYnGIssRMD3RHl4cqnyzMiQ=; b=RGNfW1iu7QhT6gVQDqMB+DguANeKF8h6UicakaiSqBTfy7piTkVYEKUQIxDw6h8Hwc WcDSv3F/xzXLU6VrKSHTPIC5LXpsDA0J3uquAnKZNi9LyIfQyM+55YmqYHRXoSHKObjz EiV/uxHcRTZFQYohqflpONi7prWJKId3DxebtYSe7Exx/vuKzGf7JRU1oOPqwCPDKuwD glegtFUMdyLgnWq+yKYBhkMzVaMds/mXH1yV9vpP7nJ3UY7+sPIogMMeuXFppC+KlT7x kFiRtabZDjBUek7r6HOsEQcUQqaAiahcGnAuSQG/AFI4gY6rTtC39rtIO7N7QTfYnol+ V5mQ== X-Gm-Message-State: AOJu0YwT+XvQMn+YAUSNfQ8u7W/2/FbhTvCqXIYybiXRsj7Bomdmmtgu 8uHztNbluPGaKoDAmR7D2HWER4LL5xeQTA== X-Received: by 2002:a05:6602:2c08:b0:790:fcc2:6e9c with SMTP id w8-20020a0566022c0800b00790fcc26e9cmr6783532iov.12.1697648782777; Wed, 18 Oct 2023 10:06:22 -0700 (PDT) Received: from frodo.. (c-73-78-62-130.hsd1.co.comcast.net. [73.78.62.130]) by smtp.googlemail.com with ESMTPSA id n4-20020a5d8244000000b0079fa1a7cd36sm1228944ioo.30.2023.10.18.10.06.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 10:06:22 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: lb@semihalf.com, linux@rasmusvillemoes.dk, joe@perches.com, mcgrof@kernel.org, daniel.vetter@ffwll.ch, jani.nikula@intel.com, ville.syrjala@linux.intel.com, seanpaul@chromium.org, robdclark@gmail.com, groeck@google.com, yanivt@google.com, bleung@google.com, rostedt@goodmis.org, linux-doc@vger.kernel.org, Jim Cromie Subject: [PATCH v7c 11/24] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Date: Wed, 18 Oct 2023 11:05:51 -0600 Message-ID: <20231018170604.569042-12-jim.cromie@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018170604.569042-1-jim.cromie@gmail.com> References: <20231018170604.569042-1-jim.cromie@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 18 Oct 2023 10:07:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780113853478033107 X-GMAIL-MSGID: 1780113853478033107 old_bits arg is currently a pointer to the input bits, but this could allow inadvertent changes to the input by the fn. Disallow this. And constify new_bits while here. Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 8158943b350d..8beb98a831f5 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -593,7 +593,8 @@ static int ddebug_exec_queries(char *query, const char *modname) /* apply a new class-param setting */ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, - unsigned long *new_bits, unsigned long *old_bits, + const unsigned long *new_bits, + const unsigned long old_bits, const char *query_modname) { #define QUERY_SIZE 128 @@ -602,12 +603,12 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, int matches = 0; int bi, ct; - if (*new_bits != *old_bits) + if (*new_bits != old_bits) v2pr_info("apply bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, - *old_bits, query_modname ?: "'*'"); + old_bits, query_modname ?: "'*'"); for (bi = 0; bi < map->length; bi++) { - if (test_bit(bi, new_bits) == test_bit(bi, old_bits)) + if (test_bit(bi, new_bits) == test_bit(bi, &old_bits)) continue; snprintf(query, QUERY_SIZE, "class %s %c%s", map->class_names[bi], @@ -619,9 +620,9 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, v2pr_info("bit_%d: %d matches on class: %s -> 0x%lx\n", bi, ct, map->class_names[bi], *new_bits); } - if (*new_bits != *old_bits) + if (*new_bits != old_bits) v2pr_info("applied bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, - *old_bits, query_modname ?: "'*'"); + old_bits, query_modname ?: "'*'"); return matches; } @@ -678,7 +679,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa continue; } curr_bits ^= BIT(cls_id); - totct += ddebug_apply_class_bitmap(dcp, &curr_bits, dcp->bits, NULL); + totct += ddebug_apply_class_bitmap(dcp, &curr_bits, *dcp->bits, NULL); *dcp->bits = curr_bits; v2pr_info("%s: changed bit %d:%s\n", KP_NAME(kp), cls_id, map->class_names[cls_id]); @@ -688,7 +689,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa old_bits = CLASSMAP_BITMASK(*dcp->lvl); curr_bits = CLASSMAP_BITMASK(cls_id + (wanted ? 1 : 0 )); - totct += ddebug_apply_class_bitmap(dcp, &curr_bits, &old_bits, NULL); + totct += ddebug_apply_class_bitmap(dcp, &curr_bits, old_bits, NULL); *dcp->lvl = (cls_id + (wanted ? 1 : 0)); v2pr_info("%s: changed bit-%d: \"%s\" %lx->%lx\n", KP_NAME(kp), cls_id, map->class_names[cls_id], old_bits, curr_bits); @@ -742,7 +743,7 @@ static int param_set_dyndbg_module_classes(const char *instr, inrep &= CLASSMAP_BITMASK(map->length); } v2pr_info("bits:0x%lx > %s.%s\n", inrep, modnm ?: "*", KP_NAME(kp)); - totct += ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits, modnm); + totct += ddebug_apply_class_bitmap(dcp, &inrep, *dcp->bits, modnm); *dcp->bits = inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: @@ -755,7 +756,7 @@ static int param_set_dyndbg_module_classes(const char *instr, old_bits = CLASSMAP_BITMASK(*dcp->lvl); new_bits = CLASSMAP_BITMASK(inrep); v2pr_info("lvl:%ld bits:0x%lx > %s\n", inrep, new_bits, KP_NAME(kp)); - totct += ddebug_apply_class_bitmap(dcp, &new_bits, &old_bits, modnm); + totct += ddebug_apply_class_bitmap(dcp, &new_bits, old_bits, modnm); *dcp->lvl = inrep; break; default: