2023-08-09 03:12:17

by Justin Stitt

Subject: [PATCH v2 6/7] netfilter: x_tables: refactor deprecated strncpy

Prefer `strscpy_pad` to `strncpy`.

Signed-off-by: Justin Stitt <[email protected]>
---
net/netfilter/x_tables.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 470282cf3fae..21624d68314f 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -768,7 +768,7 @@ void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
m->u.user.match_size = msize;
strscpy(name, match->name, sizeof(name));
module_put(match->me);
- strncpy(m->u.user.name, name, sizeof(m->u.user.name));
+ strscpy_pad(m->u.user.name, name, sizeof(m->u.user.name));

*size += off;
*dstptr += msize;
@@ -1148,7 +1148,7 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr,
t->u.user.target_size = tsize;
strscpy(name, target->name, sizeof(name));
module_put(target->me);
- strncpy(t->u.user.name, name, sizeof(t->u.user.name));
+ strscpy_pad(t->u.user.name, name, sizeof(t->u.user.name));

*size += off;
*dstptr += tsize;
@@ -2014,4 +2014,3 @@ static void __exit xt_fini(void)

module_init(xt_init);
module_exit(xt_fini);
-

--
2.41.0.640.ga95def55d0-goog

2023-08-09 21:07:23

by Florian Westphal

Subject: Re: [PATCH v2 6/7] netfilter: x_tables: refactor deprecated strncpy

Justin Stitt <[email protected]> wrote:
> Prefer `strscpy_pad` to `strncpy`.

I don't think this instance needs _pad.