Commit aa222dd1 authored by Justin Stitt's avatar Justin Stitt Committed by Florian Westphal
Browse files

netfilter: xtables: refactor deprecated strncpy 



Prefer `strscpy_pad` as it's a more robust interface whilst maintaing
zero-padding behavior.

There may have existed a bug here due to both `tbl->repl.name` and
`info->name` having a size of 32 as defined below:
|  #define XT_TABLE_MAXNAMELEN 32

This may lead to buffer overreads in some situations -- `strscpy` solves
this by guaranteeing NUL-termination of the dest buffer.

Signed-off-by: default avatarJustin Stitt <justinstitt@google.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent 06f7d3c3

net/netfilter/xt_repldata.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
	if (tbl == NULL) \

		return NULL; \

	term = (struct type##_error *)&(((char *)tbl)[term_offset]); \

	strncpy(tbl->repl.name, info->name, sizeof(tbl->repl.name)); \

	strscpy_pad(tbl->repl.name, info->name, sizeof(tbl->repl.name)); \

	*term = (struct type##_error)typ2##_ERROR_INIT;  \

	tbl->repl.valid_hooks = hook_mask; \

	tbl->repl.num_entries = nhooks + 1; \