From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) (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 DB86638E5CA for ; Wed, 8 Apr 2026 20:02:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775678555; cv=none; b=d7wIvMA3xPBtiBOCsePcNKJYTDUF9o4W38jEXcJuzuwwEMPyW0u/Zf1y6zWnSnsuOxZMKBLsQ36IOMRjHfkvIc1ZVbCaS32t5ewAUupP1vQ/3MQ66mH4KBjodGzOs4f+cuIZdS9PaNn8Wbmxlu250IW+gwHNtyLkzFahW7gWIuA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775678555; c=relaxed/simple; bh=PBAFi7y3YRuwq9TlfBtroorgB24BQAwGr2rvA4abp3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ASidWd/iEsFgNkUQQA5ZUCqwGVoxMPPgtp5xRrCZUkHrdB0zMfdvjrhsZDYEHYEOAY0YFwcLRm8/fdYRBkd6VxxRrN/FVKcLRcJhY8Gk41Ar6PJmJHVCGikLtj7XDeczTXQMuuWCayvEEu5Pb+dXzax0x56kqR+rLJgYyoBQkkU= 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=J91GyajP; arc=none smtp.client-ip=209.85.161.51 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="J91GyajP" Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-68a3b605bdcso96526eaf.2 for ; Wed, 08 Apr 2026 13:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775678552; x=1776283352; 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=Lr3BXrtiuAvHSgc8/DPsjTxu/hA/+WXgrNkg64S657g=; b=J91GyajP7/qnnCpS/MvULOMc30s1nYAQc0drWYUf3NoaX6iBgC0wczeCjD0gqyzJsx 4axBHw64UBfsV+JMQv8fNsdAcvU8khjw+SrdPdOdrLWJgjQlW8mJcF6UjPNdNZwysvGb seORmxRSNpShxUBCGBsELrh8ioIrndcetzFz3MLzgI3ikk9zt58Ssh6DxSrLOtD5PTl8 CqUCqt7qsRRRDOLvAvcTotFOIlQ/oNpeYR+zgqsyzuuuqWerc7RRrEWqzGRgqIpglKTv zvWzO0DBopYjEBxi5P/m59E0EZYB7t6I+LHI2j4ibG0gyXjqpsoaT267Kdbf+xAc28Zm JH9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775678552; x=1776283352; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Lr3BXrtiuAvHSgc8/DPsjTxu/hA/+WXgrNkg64S657g=; b=WQJ2BpUUhsMJrZszBPezo61yVmaUVJL4izn2V5YoYF2XAWw4j3xjIIEN47IBvA5aqN 1cqTqWmsqoK41izl+2xEHfgD3QD9CX8/v/rs6730P8RYQ3v0HpTTklXsJlbqR94e2g0R Hb/Js4T5VCHhCsbsmTIibHLo5jdS14MYRfaj3yHnw/vVJFhBGIYH0fdqVKC13nG2E0NZ FKMkbYaUWMQfrmRMwVD6873kMwvIc8kPW6o6ME3UIjrwSsp7O3ufEQaXpmtjOlth6FW9 UPtclyqmw7VNkHZ7UGKgMeX4oRNeFEMLwQAju2AoFbPsp04qEjd1tm387vMfOOTFy8tI RLJg== X-Gm-Message-State: AOJu0Yx5NbmPyGIfbgEW/0ipVoGKhKKKZoVKAmvOuTdah91PT0kAnOPf MKtbtCoOMNdCD8Gxxy2a6I18fBKVakFJKa5df264qcT/OjqlOjjArPXSvVV8Kw== X-Gm-Gg: AeBDiestXMRovdoVVIYm3/o0hKFRhoTY3uG69eGUC2XgEbQ/JzO2WIzNaml9JFVjYjp zxbjBqADJhiAaPDdPSCqHZgXAWpTiuUcbuIG+bkdyZZVUazd46lEN67fFMW5k4cwOtSliB9enn3 jeSb0PTMSpyk8WYW9qXzjre1l97UMyKpTqntywo306DvNAVxP5vyJHStRliwdLpa2WCO3BxlaBO eWXWzhvAQMLhOOj0x7Pmi0OcaFTdC8BHNtZXmpgMKRrQSRrVFcKd8Mii8H3lWl6nCmrycf57QFV HwezdUOftFe7RjZguWsurWoyFc3dWtU6YKg2UxrCgVxcQN5U6bDLlk1JnpfRMag5pN8tHAD/6ae JKB6rBpTWKazYEb/aOTKHEjHHI1DyJ/SgCRRUVFBw33uHxQsTR+Rz8rrrhGzhyrz/08uQMAaK6r QDU+bY4OM84TnL6kAdQt3MRy8OKvz+VjeiYdOC2RL8we4yHQmmKq1W1KB+fmaKe/UdDh8707YNh yg= X-Received: by 2002:a05:6820:1b19:b0:67e:2c9b:54f7 with SMTP id 006d021491bc7-6821fe60f6cmr11214082eaf.33.1775678552546; Wed, 08 Apr 2026 13:02:32 -0700 (PDT) Received: from frodo.raven-morpho.ts.net (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 006d021491bc7-680a63c7fd1sm12254208eaf.8.2026.04.08.13.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 13:02:32 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, jbaron@akamai.com, louis.chauvet@bootlin.com, Jim Cromie Subject: [PATCH v13 16/36] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Date: Wed, 8 Apr 2026 14:01:51 -0600 Message-ID: <20260408200211.43821-17-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408200211.43821-1-jim.cromie@gmail.com> References: <20260408200211.43821-1-jim.cromie@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.53.0