mirror of
https://github.com/torvalds/linux.git
synced 2026-05-02 05:22:49 -04:00
06d5a7afe1
The commitafd2627f72("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:a0a927d06d("mei: me: add io register tracing") Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Link: https://patch.msgid.link/20260111145125.1754912-1-alexander.usyskin@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
84 lines
2.0 KiB
C
84 lines
2.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (c) 2015-2016, Intel Corporation. All rights reserved.
|
|
* Intel Management Engine Interface (Intel MEI) Linux driver
|
|
*/
|
|
|
|
#if !defined(_MEI_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _MEI_TRACE_H_
|
|
|
|
#include <linux/stringify.h>
|
|
#include <linux/types.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
#include <linux/device.h>
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM mei
|
|
|
|
TRACE_EVENT(mei_reg_read,
|
|
TP_PROTO(const struct device *dev, const char *reg, u32 offs, u32 val),
|
|
TP_ARGS(dev, reg, offs, val),
|
|
TP_STRUCT__entry(
|
|
__string(dev, dev_name(dev))
|
|
__string(reg, reg)
|
|
__field(u32, offs)
|
|
__field(u32, val)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(dev);
|
|
__assign_str(reg);
|
|
__entry->offs = offs;
|
|
__entry->val = val;
|
|
),
|
|
TP_printk("[%s] read %s:[%#x] = %#x",
|
|
__get_str(dev), __get_str(reg), __entry->offs, __entry->val)
|
|
);
|
|
|
|
TRACE_EVENT(mei_reg_write,
|
|
TP_PROTO(const struct device *dev, const char *reg, u32 offs, u32 val),
|
|
TP_ARGS(dev, reg, offs, val),
|
|
TP_STRUCT__entry(
|
|
__string(dev, dev_name(dev))
|
|
__string(reg, reg)
|
|
__field(u32, offs)
|
|
__field(u32, val)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(dev);
|
|
__assign_str(reg);
|
|
__entry->offs = offs;
|
|
__entry->val = val;
|
|
),
|
|
TP_printk("[%s] write %s[%#x] = %#x",
|
|
__get_str(dev), __get_str(reg), __entry->offs, __entry->val)
|
|
);
|
|
|
|
TRACE_EVENT(mei_pci_cfg_read,
|
|
TP_PROTO(const struct device *dev, const char *reg, u32 offs, u32 val),
|
|
TP_ARGS(dev, reg, offs, val),
|
|
TP_STRUCT__entry(
|
|
__string(dev, dev_name(dev))
|
|
__string(reg, reg)
|
|
__field(u32, offs)
|
|
__field(u32, val)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(dev);
|
|
__assign_str(reg);
|
|
__entry->offs = offs;
|
|
__entry->val = val;
|
|
),
|
|
TP_printk("[%s] pci cfg read %s:[%#x] = %#x",
|
|
__get_str(dev), __get_str(reg), __entry->offs, __entry->val)
|
|
);
|
|
|
|
#endif /* _MEI_TRACE_H_ */
|
|
|
|
/* This part must be outside protection */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_PATH .
|
|
#define TRACE_INCLUDE_FILE mei-trace
|
|
#include <trace/define_trace.h>
|