Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad0a3b68 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

trace: add build-time check to avoid overrunning hex buffer 



Remove the runtime BUG_ON and change to a compile-time check in
the macro that calls the hex format routine

[Noticed by Joe Perches]
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2fbc4749

kernel/trace/trace.c

+3 −3
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ trace_seq_putmem(struct trace_seq *s, void *mem, size_t len) 
	return len;

}



#define HEX_CHARS 17

#define MAX_MEMHEX_BYTES	8

#define HEX_CHARS		(MAX_MEMHEX_BYTES*2 + 1)



static int

trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len)
@@ -344,8 +345,6 @@ trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len) 
	unsigned char *data = mem;

	int i, j;



	BUG_ON(len >= HEX_CHARS);



#ifdef __BIG_ENDIAN

	for (i = 0, j = 0; i < len; i++) {

#else
@@ -1668,6 +1667,7 @@ do { \ 


#define SEQ_PUT_HEX_FIELD_RET(s, x)			\

do {							\

	BUILD_BUG_ON(sizeof(x) > MAX_MEMHEX_BYTES);	\

	if (!trace_seq_putmem_hex(s, &(x), sizeof(x)))	\

		return 0;				\

} while (0)