From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77F4331E840 for ; Mon, 4 May 2026 20:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777927532; cv=none; b=JzwlEniGG2AHr78f8mYuohlLoT8Z497RbSy0/Pmo4Nq0F1JWh8Q59VUHDTDQRv0japUEeY7kSIPfhtKS4HSQr29lnydfh/cg+PQuBzj5zweQSZ+53D/8lVqM8UKYP2zx8POxru9eb4AxtZjAIWU8zbKLRM6pW400OHqDyVubvSA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777927532; c=relaxed/simple; bh=JZXjwW4jWxbmsrp9pcCx1mbkiF6OrJYXnqqrzYBS0w4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i6Ubc5ifhOBil7ixB2nYPuChzMgHEhhmswl6wC2C8bhdBSK2F03WuMl2XCZ26utEa+/MfLKqodfBShLK4/w3xnvHdfcQDlhKKEuHn3nZSfgl6ugnOZlnxyC8O3XKVpTJO/zrM9yJlSmsNHudCE9163qKDjYA2B6OOKfvMvDamTU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LWte09Wt; arc=none smtp.client-ip=209.85.210.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LWte09Wt" Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-7dcc9b506d9so4431451a34.1 for ; Mon, 04 May 2026 13:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777927528; x=1778532328; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=A6AWJq+iuX9rkBsQZzPPBkpT39IXEVqnsK+4ZJ/OL6o=; b=LWte09Wt6XJ6c/B7/0b2XsM/m3UfleHorw2z7e/ApSkGjkNZD5WdCdZ+bCMyCUKSUH qZPl+NrxkRwiJd61UHh5GyQmWkLdTq0bEWixlIpHIL0MNUttr/80Bv3X0EgMt//qtdLw G6IWFLnRTVyB8cp503nyypOk3nGHHeSvPH/8TiDK9x8UPDFYlt7F5fzpEmBorKzasXoA +xWZX15+ikXQT/USsc2HEqVaRYQmmRRcB2MjQq0lgCz52h51/g2QcKodtAqGz6P0/gyf rhOKcsPmlUAK5rXKmiBbRNybYGwVq5JBuI8JKitYfiOznoo6ThDCwgm58ZlRZuciV+xI 4hDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777927528; x=1778532328; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=A6AWJq+iuX9rkBsQZzPPBkpT39IXEVqnsK+4ZJ/OL6o=; b=oF2xTNQE5b/O43QrIj2GhAvOOeH7UgYFksz/uLiDO87uixX9D+sJjpHLgS5y7gIPMJ dwxZD69gNL7xoK3G2Ytr1qQKpqxwf1cnWf7VhirZWmyQSjZsXuAklLIdoMnZMe3CCv9u yeNgzf7PzsdPN6iILhAiaWWgoIytxFtNTbhS/eZ2fSLYov/q5MfBlEhO+cPWlFcN129D ZhddHES/hB/8WrDA8ceHCXSbfuOSpRlXBuIJWKZ6LSgkWdhuPuqrVmZ4T1NRZf54GQQr Mg2+0K1/5RBuQhORObMLkMKu/s1mPhBy3hhNkqnoSIOUFWwbVzQa+XMMwhB+V/m7hxsL DAJA== X-Forwarded-Encrypted: i=1; AFNElJ9EbwvWQ4VOdy95zMiswcDoNWjvabDMjQQgZRxJenc+pldBfn4e0qKO6x8EK6VBUwxytCNYwVAUwVfVkhGo@vger.kernel.org X-Gm-Message-State: AOJu0Ywxmtnz2w/Sdz3+JQpoet47x5IM/15zZLWz12qn5rRk/hNGdLjM Dq16Fd/yps22/biokTIqH9zdABYTYOrPfJ4GfLrL/5Ts+G2A21OFQjIe X-Gm-Gg: AeBDieu09fvo3aCY+RofJ3Oq2hl8Wii+Hg5LYuXGlxVPSjtw1BvdXeJCuGEFWXjlbis NRZlqbMCPvkGuyU4flECkLbsASJDqx7utd5t2t9idf1/pPIY+Jek/KAXT+s8ICeyJdOHoME0c7M LQI3JlNEEFqLJN7GKepQGcvl5mnQXJm6nHW0/5/as97/IS8+wqSVQiC3PUYlN2CDJG65uZelMRn QXgRd5HAH9lo1yEG6pm4pTZMe3cchAP43srhSs/ebZCNW4FCPVVJxQwnXoM2896maxnFTL1/89S MuG/P9ABfrF/wJ4sry1nI6Wyf7ww9P1CFIHDD1e0MJdQApOD+fr9K8tVqwG2N5ivqwKdI9H47gR hLXkU1caWl3tsJafn8TsLqVjYB+7x6mzWRUomin4xcMT5JQ8ToupvD7Kp5AX1Xw+rOioPu7jatf Q4xddLNWWIk5ro2mHhBanaIaQi0Af7O5iya7GhSx43OVzEti49sn8eJNOioMsU/0AxuyLCazvn X-Received: by 2002:a05:6820:210e:b0:696:7d51:79e3 with SMTP id 006d021491bc7-69697c60c61mr5959128eaf.42.1777927528202; Mon, 04 May 2026 13:45:28 -0700 (PDT) Received: from [100.82.231.29] (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 006d021491bc7-69689266bacsm7144713eaf.0.2026.05.04.13.45.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 13:45:27 -0700 (PDT) From: Jim Cromie Date: Mon, 04 May 2026 14:45:15 -0600 Subject: [PATCH 09/17] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260504-dd-cleanups-2-v1-9-6fdd24040642@gmail.com> References: <20260504-dd-cleanups-2-v1-0-6fdd24040642@gmail.com> In-Reply-To: <20260504-dd-cleanups-2-v1-0-6fdd24040642@gmail.com> To: Andrew Morton , Jason Baron , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , Shuah Khan , Louis Chauvet Cc: linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, linux-kselftest@vger.kernel.org, Jim Cromie X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777927513; l=3865; i=jim.cromie@gmail.com; s=20260203; h=from:subject:message-id; bh=JZXjwW4jWxbmsrp9pcCx1mbkiF6OrJYXnqqrzYBS0w4=; b=iqIVsPdjPxQ0kbii3QftSNVTypTv/hH5d4EWhD6WA8bVuPTvnPsVXpNzeMwKbYbEMmMTQAh0h 4R8GLfRD8FADhA9FAUUFYEwn/6j/0N9Dgg4Ibr1LWXbe9znvtswebss X-Developer-Key: i=jim.cromie@gmail.com; a=ed25519; pk=C6E5ODlPQo7ZBynATXH9wg7K6HxP0pIXyf4s38Qw0XE= 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. Reviewed-by: Louis Chauvet 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 4313c8803007..a18f4bc63473 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -607,7 +607,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 @@ -616,12 +617,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], @@ -633,9 +634,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; } @@ -691,7 +692,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]); @@ -701,7 +702,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); @@ -755,7 +756,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, mod_name ?: "*", KP_NAME(kp)); - totct += ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits, mod_name); + totct += ddebug_apply_class_bitmap(dcp, &inrep, *dcp->bits, mod_name); *dcp->bits = inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: @@ -768,7 +769,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, mod_name); + totct += ddebug_apply_class_bitmap(dcp, &new_bits, old_bits, mod_name); *dcp->lvl = inrep; break; default: -- 2.54.0