From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AB5122097 for ; Thu, 29 Jan 2026 00:09:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769645372; cv=none; b=h3J0ojd2kJG24gdzTl6xgS06DpMk5L7nsBQLSVw7V1zmK7CbO3zWoY+xYYzH0/aKe9hwOzajxoX1TbBNpWT70Nyg/MR73XEXOehOiMn0azQSH5XAWj8ptQn6gKqvN9u96OoYkEFBS7r0/MGmvvTBVkYRsMfvNNxNaKgMAmTGZZo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769645372; c=relaxed/simple; bh=ogrLP/NAWfQ/tNsxbWmmt8VaxfRegg3j4xVPhti5Ksk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RRapueyKRlHo/FOE5psYrHn8hCmh4624rksnt8t+o7ghEID5G7vQjzivqijDZ+2V4Vap2wIWIBnb3D4Qr/KleRQAu1AfHKTexN2zEbH+6yWKHc34XxyuWNShzAR4lH13Tfn0YPrLm/mOhEjySVZ+yo00d1XhtfYWuWpLquM7IcI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YJUIF8ZX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YJUIF8ZX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79AE2C116C6; Thu, 29 Jan 2026 00:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769645372; bh=ogrLP/NAWfQ/tNsxbWmmt8VaxfRegg3j4xVPhti5Ksk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YJUIF8ZXE3rs31JesAPnfmIRsGE15nMw9kUJhBW0+JQmRadYDqIsKf0u4w8iZ1U// jYsw0orB2qLWAsaUaRe4tBxm15CdqnwYOKmGUcmB5RSxevtqg9LDpGeL9CnztLBQzy uXWe+dOC3ngesUn4Wo9STl769/uXspwXziyXvwoxeB/O4RIPGCZIAibRFzTaIJhvnb kseZChXrcxdlSFekgzSWiGIsr2TEufBBYBzraUJylAem6Dncoi13WeZHzX3fiM/BDu 62EMn69KQ1bMeLrWeNQVxGMmrMTFYOyRNV2mBXdySy4eqAHR4p7ASCeMqbREfimxXG Nq1l7sYhRlkeg== From: Sasha Levin To: stable@vger.kernel.org Cc: Alexander Usyskin , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 5.10.y] mei: trace: treat reg parameter as string Date: Wed, 28 Jan 2026 19:09:29 -0500 Message-ID: <20260129000930.2930326-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026012709-glutinous-thud-93ff@gregkh> References: <2026012709-glutinous-thud-93ff@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Alexander Usyskin [ Upstream commit 06d5a7afe1d0b47102936d8fba568572c2b4b941 ] The commit afd2627f727b ("tracing: Check "%s" dereference via the field and not the TP_printk format") forbids to emit event with a plain char* without a wrapper. The reg parameter always passed as static string and wrapper is not strictly required, contrary to dev parameter. Use the string wrapper anyway to check sanity of the reg parameters, store it value independently and prevent internal kernel data leaks. Since some code refactoring has taken place, explicit backporting may be needed for kernels older than 6.10. Cc: stable@vger.kernel.org # v6.11+ Fixes: a0a927d06d79 ("mei: me: add io register tracing") Signed-off-by: Alexander Usyskin Link: https://patch.msgid.link/20260111145125.1754912-1-alexander.usyskin@intel.com Signed-off-by: Greg Kroah-Hartman [ adapted single-argument __assign_str() calls to two-argument form ] Signed-off-by: Sasha Levin --- drivers/misc/mei/mei-trace.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/misc/mei/mei-trace.h b/drivers/misc/mei/mei-trace.h index df758033dc937..90249f74f374e 100644 --- a/drivers/misc/mei/mei-trace.h +++ b/drivers/misc/mei/mei-trace.h @@ -21,18 +21,18 @@ TRACE_EVENT(mei_reg_read, TP_ARGS(dev, reg, offs, val), TP_STRUCT__entry( __string(dev, dev_name(dev)) - __field(const char *, reg) + __string(reg, reg) __field(u32, offs) __field(u32, val) ), TP_fast_assign( __assign_str(dev, dev_name(dev)) - __entry->reg = reg; + __assign_str(reg, reg) __entry->offs = offs; __entry->val = val; ), TP_printk("[%s] read %s:[%#x] = %#x", - __get_str(dev), __entry->reg, __entry->offs, __entry->val) + __get_str(dev), __get_str(reg), __entry->offs, __entry->val) ); TRACE_EVENT(mei_reg_write, @@ -40,18 +40,18 @@ TRACE_EVENT(mei_reg_write, TP_ARGS(dev, reg, offs, val), TP_STRUCT__entry( __string(dev, dev_name(dev)) - __field(const char *, reg) + __string(reg, reg) __field(u32, offs) __field(u32, val) ), TP_fast_assign( __assign_str(dev, dev_name(dev)) - __entry->reg = reg; + __assign_str(reg, reg) __entry->offs = offs; __entry->val = val; ), TP_printk("[%s] write %s[%#x] = %#x", - __get_str(dev), __entry->reg, __entry->offs, __entry->val) + __get_str(dev), __get_str(reg), __entry->offs, __entry->val) ); TRACE_EVENT(mei_pci_cfg_read, @@ -59,18 +59,18 @@ TRACE_EVENT(mei_pci_cfg_read, TP_ARGS(dev, reg, offs, val), TP_STRUCT__entry( __string(dev, dev_name(dev)) - __field(const char *, reg) + __string(reg, reg) __field(u32, offs) __field(u32, val) ), TP_fast_assign( __assign_str(dev, dev_name(dev)) - __entry->reg = reg; + __assign_str(reg, reg) __entry->offs = offs; __entry->val = val; ), TP_printk("[%s] pci cfg read %s:[%#x] = %#x", - __get_str(dev), __entry->reg, __entry->offs, __entry->val) + __get_str(dev), __get_str(reg), __entry->offs, __entry->val) ); #endif /* _MEI_TRACE_H_ */ -- 2.51.0