From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) (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 7E56E32BF44 for ; Mon, 22 Dec 2025 08:23:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766391814; cv=none; b=IFct47Idh5UU5wtiZd5cDtYVJubouRXOLlzZwuNUfgo6HK/IZJD1wXZK5VaF6nMJZCYlMvHeNtpyiQiBt5L+7LuC1FMsWlr5mtKY/oYdoQOuqHBRAkfCQxBzx+k6HJOsDtj0OUIvhaL5RFuhRJIrj/V2CRKGTSxyk6Hebb+pmyM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766391814; c=relaxed/simple; bh=KZmY7t1nCms4fl3dBwXkSTLPAQxgaCZAAwmDCUvbFS0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bfIo4GiWqcQ2q0dv4WnGnl78fu2QOLN4r/4v00Gcrl2NSzp7ogilFzbW6FqjUY38CXRx4AQ6RcHQHqwIw0mHBhOaV3LK444Pd2g/DJLr06cDqUm1HMcl3XM2JiXyFE5+CAOzx8fWSz5AIbk1x2jEt6/satRA9jiE7DyI9oWTqLE= 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=LD8Z84Wm; arc=none smtp.client-ip=209.85.210.194 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="LD8Z84Wm" Received: by mail-pf1-f194.google.com with SMTP id d2e1a72fcca58-7b9387df58cso6063128b3a.3 for ; Mon, 22 Dec 2025 00:23:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766391813; x=1766996613; 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=OmSrywNj94qh5LuqDwB/XOVQgrfMaP0ThWQZPNx1I5w=; b=LD8Z84WmGU9Qc1V30887Kjxn6P0Cj65ovH7mhZ8hzYY3Wiw0mNWwkCFlrSH7W9t9Jg 9DmHwGhTcIdIkXrdW9zVQg+GGQGR0uSfKoOs+I1otG1KUMZCoA69oT7aty1Uwl3kJlqb kWGtWjMsp2HXwIadC9NQCliMuXamk+noEmzJ+kqQgDPBxBONskj2WtFTt0JAR+pcDnAO WeSBVZlKDvbYqj4NMtD3ovjkKYWn2mcPkjooCdWyMz+LgQ4Vtm3gPEwE3LQ+LPLGao87 2r9RhpEengoUJsmqgOxqoDg95ralebhLIe3OWXt8h8qOk2+vNl50dzSqY8bTh7XXSpDm SCag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766391813; x=1766996613; 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=OmSrywNj94qh5LuqDwB/XOVQgrfMaP0ThWQZPNx1I5w=; b=A2FA+QdTTFNXqyGX86OAe6b+4495iHVtsNko+YAKeUQoLHDdWVAymJN11ooBiG+o3m 5+R3PeaOK0ma3KT3g++ZlnZCUyacZ77Zf7iAdVsqTkqQ4T7INIAEXtJ/g9haj+E+AXR9 dtfNeZiMngQiBkUaWjZhvbKWBJnUQ4r/moaEawtFXwJ7X5f0jsXpbUdBoP9YqUaeHa4v aJl5SxSs5KkONaGfsHuxn1SbIkezH09zBdGgCzChgOzPkxAOsFopUFF0MJRqBONuxdGe Qbw2Oo3kLJigjvmbH/tBGPbGid8+Nuh5bST94X2zzPwPjeyutyzTqbVqypkRcmtw4Imr fNIg== X-Gm-Message-State: AOJu0Yzogu4w3RzVFMfgzM27e4M0Kqoz6XAfE9g532L7Zlrj9h10quII 58xZSxiseuO5yr1tiIzfWvkOMgCT8yqXsv4bXhNEFxiehyYWu+0yxogTz9M26zE8YwkAMw== X-Gm-Gg: AY/fxX7yzYJsCI+weC2hX1RhnE2AP1lblhAktByM+P/k6t6ygFILthexVrhEO374Aci 22Qm6xJGmBOZ3TTYgXZzmNBP2m7/1EPdB9khta68Q5y2e8BlOeK6C0msDGQRq8jnpkiuvujAXyO nhPe6RWElzH03h8Ow3/imBmb1mgdrBG3UlK7uM68aN1zbzQqg/wboHombvATjnO3GcaEVtRiFJ3 xgtSBlsvsbT91nakV8nhendBxasFHksKwFnnXyDUU+3F50XXPi4X0IEd0NBtMRa2l/toDuSHA0n KL2GRNGcD8tKdQMgBGq+iU0j2n4mez6ueaZX1fUwCOklVs3nEb7BqrGM9zeAxKZxjOLV/yIBF1/ ja88JOUb9OEjjuHTx9XdJEqftx1dPH/2N9zXgroX8jd7z7Byd4RPfQF9J2T57r+U/2JAUhzFYy+ qyVjPp8pVo X-Google-Smtp-Source: AGHT+IEAZMs9QfUDe2we6n2g+FitaNoCAtMAvZyB3nOYDQz1xn8UTnE5egrQpYntQN6837WRTsLoLQ== X-Received: by 2002:a05:6a00:3309:b0:7f0:665d:efd8 with SMTP id d2e1a72fcca58-7ff6705d34cmr9495645b3a.67.1766391812599; Mon, 22 Dec 2025 00:23:32 -0800 (PST) Received: from frodo ([2404:4400:417e:3d00:8b90:7f55:1261:772f]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-7ff7e493123sm9540699b3a.50.2025.12.22.00.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Dec 2025 00:23:32 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, daniel.vetter@ffwll.ch, tvrtko.ursulin@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, seanpaul@chromium.org, robdclark@gmail.com, groeck@google.com, yanivt@google.com, bleung@google.com, quic_saipraka@quicinc.com, will@kernel.org, catalin.marinas@arm.com, quic_psodagud@quicinc.com, maz@kernel.org, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, mingo@redhat.com, jim.cromie@gmail.com Subject: [PATCH v7 12/31] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Date: Mon, 22 Dec 2025 21:20:29 +1300 Message-ID: <20251222082049.1782440-13-jim.cromie@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251222082049.1782440-3-jim.cromie@gmail.com> References: <20251222082049.1782440-3-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 64d69f5cba1b..db0559763e60 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -606,7 +606,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 @@ -615,12 +616,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], @@ -632,9 +633,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; } @@ -690,7 +691,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]); @@ -700,7 +701,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); @@ -754,7 +755,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: @@ -767,7 +768,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.52.0