| Message ID | 20230809-net-netfilter-v2-7-5847d707ec0a@google.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | aa222dd190d69ca8e0e2b990ec171c67a74d5383 |
| Headers | show |
| Series | netfilter: refactor deprecated strncpy | expand |
Justin Stitt <justinstitt@google.com> wrote: > 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. I don't think we need to use _pad here.
diff --git a/net/netfilter/xt_repldata.h b/net/netfilter/xt_repldata.h index 68ccbe50bb1e..5d1fb7018dba 100644 --- a/net/netfilter/xt_repldata.h +++ b/net/netfilter/xt_repldata.h @@ -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; \
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: Justin Stitt <justinstitt@google.com> --- Note: build tested only --- net/netfilter/xt_repldata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)