From nobody Tue Dec 2 02:42:11 2025 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (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 0B94E3612CB for ; Tue, 18 Nov 2025 20:19:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497157; cv=none; b=CgrGSvPZF+K7nhPCv+kfGPtm7OxJZoaeCQkiUDnDKw/vhh5Kbzy9R5mtIH3wiwhLG1TCKuR5WciYLqbnVUYeDSR5igfQJL7HnbEDi65fvsSBytL2sG85BVSnRleEvLEWfSUleHVBQaHhFNx7TUEAHGIEQzfBh+FY6+mLsmS1KsE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497157; c=relaxed/simple; bh=2eyFX9887pWvaNAvh0yNMg76uj1PYDsonSKdRoubYQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YmYK0n940+t/qKIUUZ4k4ZBiJFnILflDqlhw3gUXuQuYGM0frNx7+NbCXTONpcQo//gfyZosyVQARtiMU5B7j8iRJssmKjhZfsp0tTIJJFZ42rrDACQxQKCzn5oquHZsU4ObLNjwJAdJ7q9yC6+K2gWgb2c+NFXaNzTMmrIYMnk= 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=fvDMtrBm; arc=none smtp.client-ip=209.85.166.42 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="fvDMtrBm" Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-94861514a5cso392874939f.1 for ; Tue, 18 Nov 2025 12:19:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763497154; x=1764101954; 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=SOP7OLuL6Rs+m1spO13O+MWJO5WNRZEJe8z7hAFLE38=; b=fvDMtrBmeGE07O6qyWMuK3vnRLx8oMLNFONYU5GpicnQJyUGNU2gkDtkwnFsCBHffA JOx+vSvfQ9N70X5Xrg5xwgC2uA/TCujICsYgAHsk2VG80Hok1IjiwvtxpYORobgYfBuh Bik4kMS2R0o43RLov8Zr0Z+IwFJp2zDrgze08O+gJVpH7SjHebFpPzWtPG0UIDooyxMq MJJKcVzG81m9roZ8ZxNfXnKSAnLb2J7EVa5nFLYsuy/Z6vDaqA+Txu7CopgBRGadcyno 0LVUFxmBG6FzQaUL9fUhQ2u7PQfrsnseMdjfinH30zHIr0voFUyXJLo2RjLn2YTg4pmX 6Bpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763497154; x=1764101954; 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=SOP7OLuL6Rs+m1spO13O+MWJO5WNRZEJe8z7hAFLE38=; b=gnLE5PIKZXUUAPTqvF+c8iLNfpMrp60Y2Co0moPKU47wE1SN71M90ysjDDpgPpOeAt bm4fNRUzOn+nAljEt1KzmyOvKIxxdYfjzXlAyVVvYHAD0AiDluntKuo4wDmtY4or9MN5 cmPM8OpZCV4DsKtoeceyGkt6fP3/b1YDss/RSfCLPzS737qvRiUw8fh/QWKrCWCIH+Yu R9KKYXfgzpKlRND81aXjkfUSwgjamXzHekBCUcJdq3KhRYhswKDYJVD73Sej3XEUmEfe O0uUsZqQtI+29QjE2THWenDhOKZEBvI2dYy1GO0QWvqy5OcxqQgFdKbdl9Aec6ZD637f Axig== X-Gm-Message-State: AOJu0YxBrjlQyfuJO5jOoZkL8iPyzQ6eq1ldtqDrI3O6WiZF/C8owPm+ 6o0BIggrSN9iDb/fXPixECT5aNPfUYWvLgCPgjZq6JHWRlWHX1uUQPRJwa8oWnGM X-Gm-Gg: ASbGncugkxmZHytv7aufP2QxvMOut0id4ZUCNoJZRLfVVz2h5nhUcZ+JvD+Tubi7Xhn doXwFu9vHk+s3be9gxB5RpWzzRoOhL6AQOKgYe9MRJ9bTYLjqSshViaWsMRV4KW0eFW80dL4n1X ivisoaJr2ZooNj9PgESeyEAhpUqBdv0+v4dv/Tw9A16fXT+cw+tpPfHhYMR2zGCI2m64m0M0iJ7 s1XwagRb1+feeBQ7rhRPbm3+5acZnVyAl/5gV3CbtTPV5+tsfXFF0F6DccOpBLrpXKzzJIDR4DM AKQ0DgmjIYBCunnRWXBt5ZYbHGTXZB5AmhJ97zey+2x66doh6uGQfcEJQ7kM4Aqui7nD9N6tgwl kPYNu4d7xKU5G54kSDWyG79rV5BlZ39cjHqEkOR+AtWerGHVrby59Stkj1/rS6WMrBam6J/2PHb rB5AfUzekAYY6QpW57MVfIgBNG/Ey512sVtHhpgtTnBiCzLpAbpkJhCdaoc7ao6KMLUf45xg14B zaktg== X-Google-Smtp-Source: AGHT+IEJ6iPTY53CeotOpkSdm3SjFRuFfAtmkE5eXc2Bbumw5jt44yQqagO0uBDeBTwAt0IceTrVsA== X-Received: by 2002:a05:6602:1249:b0:948:701c:86da with SMTP id ca18e2360f4ac-948e0db338bmr1851494239f.13.1763497153807; Tue, 18 Nov 2025 12:19:13 -0800 (PST) Received: from godzilla.raven-morpho.ts.net (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id ca18e2360f4ac-948fd4c273bsm419823939f.18.2025.11.18.12.19.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 12:19:13 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, gregkh@linuxfoundation.org, jbaron@akamai.com Cc: ukaszb@chromium.org, louis.chauvet@bootlin.com, Jim Cromie Subject: [PATCH v6 12/31] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Date: Tue, 18 Nov 2025 13:18:22 -0700 Message-ID: <20251118201842.1447666-13-jim.cromie@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251118201842.1447666-1-jim.cromie@gmail.com> References: <20251118201842.1447666-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Louis Chauvet --- 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) =20 /* 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 dde= bug_class_param *dcp, int matches =3D 0; int bi, ct; =20 - if (*new_bits !=3D *old_bits) + if (*new_bits !=3D old_bits) v2pr_info("apply bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, - *old_bits, query_modname ?: "'*'"); + old_bits, query_modname ?: "'*'"); =20 for (bi =3D 0; bi < map->length; bi++) { - if (test_bit(bi, new_bits) =3D=3D test_bit(bi, old_bits)) + if (test_bit(bi, new_bits) =3D=3D test_bit(bi, &old_bits)) continue; =20 snprintf(query, QUERY_SIZE, "class %s %c%s", map->class_names[bi], @@ -632,9 +633,9 @@ static int ddebug_apply_class_bitmap(const struct ddebu= g_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 !=3D *old_bits) + if (*new_bits !=3D old_bits) v2pr_info("applied bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, - *old_bits, query_modname ?: "'*'"); + old_bits, query_modname ?: "'*'"); =20 return matches; } @@ -690,7 +691,7 @@ static int param_set_dyndbg_classnames(const char *inst= r, const struct kernel_pa continue; } curr_bits ^=3D BIT(cls_id); - totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, dcp->bits, NULL); + totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, *dcp->bits, NULL); *dcp->bits =3D 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 *inst= r, const struct kernel_pa old_bits =3D CLASSMAP_BITMASK(*dcp->lvl); curr_bits =3D CLASSMAP_BITMASK(cls_id + (wanted ? 1 : 0 )); =20 - totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, &old_bits, NULL); + totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, old_bits, NULL); *dcp->lvl =3D (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 &=3D CLASSMAP_BITMASK(map->length); } v2pr_info("bits:0x%lx > %s.%s\n", inrep, mod_name ?: "*", KP_NAME(kp)); - totct +=3D ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits, mod_name); + totct +=3D ddebug_apply_class_bitmap(dcp, &inrep, *dcp->bits, mod_name); *dcp->bits =3D inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: @@ -767,7 +768,7 @@ static int param_set_dyndbg_module_classes(const char *= instr, old_bits =3D CLASSMAP_BITMASK(*dcp->lvl); new_bits =3D CLASSMAP_BITMASK(inrep); v2pr_info("lvl:%ld bits:0x%lx > %s\n", inrep, new_bits, KP_NAME(kp)); - totct +=3D ddebug_apply_class_bitmap(dcp, &new_bits, &old_bits, mod_name= ); + totct +=3D ddebug_apply_class_bitmap(dcp, &new_bits, old_bits, mod_name); *dcp->lvl =3D inrep; break; default: --=20 2.51.1