Skip to content

Commit f6ed9c5

Browse files
committed
overflow: Introduce struct_offset() to get offset of member
The trace_marker_raw file in tracefs takes a buffer from user space that contains an id as well as a raw data string which is usually a binary structure. The structure used has the following: struct raw_data_entry { struct trace_entry ent; unsigned int id; char buf[]; }; Since the passed in "cnt" variable is both the size of buf as well as the size of id, the code to allocate the location on the ring buffer had: size = struct_size(entry, buf, cnt - sizeof(entry->id)); Which is quite ugly and hard to understand. Instead, add a helper macro called struct_offset() which then changes the above to a simple and easy to understand: size = struct_offset(entry, id) + cnt; This will likely come in handy for other use cases too. Link: https://lore.kernel.org/all/CAHk-=whYZVoEdfO1PmtbirPdBMTV9Nxt9f09CK0k6S+HJD3Zmg@mail.gmail.com/ Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> Link: https://patch.msgid.link/20251126145249.05b1770a@gandalf.local.home Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Reviewed-by: Kees Cook <kees@kernel.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent f83ac75 commit f6ed9c5

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

include/linux/overflow.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,18 @@ static inline size_t __must_check size_sub(size_t minuend, size_t subtrahend)
458458
#define struct_size_t(type, member, count) \
459459
struct_size((type *)NULL, member, count)
460460

461+
/**
462+
* struct_offset() - Calculate the offset of a member within a struct
463+
* @p: Pointer to the struct
464+
* @member: Name of the member to get the offset of
465+
*
466+
* Calculates the offset of a particular @member of the structure pointed
467+
* to by @p.
468+
*
469+
* Return: number of bytes to the location of @member.
470+
*/
471+
#define struct_offset(p, member) (offsetof(typeof(*(p)), member))
472+
461473
/**
462474
* __DEFINE_FLEX() - helper macro for DEFINE_FLEX() family.
463475
* Enables caller macro to pass arbitrary trailing expressions

kernel/trace/trace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7642,7 +7642,7 @@ static ssize_t write_raw_marker_to_buffer(struct trace_array *tr,
76427642
size_t size;
76437643

76447644
/* cnt includes both the entry->id and the data behind it. */
7645-
size = struct_size(entry, buf, cnt - sizeof(entry->id));
7645+
size = struct_offset(entry, id) + cnt;
76467646

76477647
buffer = tr->array_buffer.buffer;
76487648

0 commit comments

Comments
 (0)