diff options
| author | Justin Stitt <justinstitt@google.com> | 2023-08-09 01:06:08 +0000 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-08-22 15:13:21 +0200 |
| commit | 6d87a4eae89e2ae015b40fd0adc90e9a7dc9fccb (patch) | |
| tree | 31ca7d387e03689d4f503fc52d585540f465427e /net/netfilter/nft_osf.c | |
| parent | 7457af8bf9948aeb31de21e4be3bc1fef2730958 (diff) | |
| download | linux-6d87a4eae89e2ae015b40fd0adc90e9a7dc9fccb.tar.gz | |
netfilter: nft_osf: refactor deprecated strncpy
Use `strscpy_pad` over `strncpy` for NUL-terminated strings.
We can also drop the + 1 from `NFT_OSF_MAXGENRELEN + 1` since `strscpy`
will guarantee NUL-termination.
Signed-off-by: Justin Stitt <justinstitt@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net/netfilter/nft_osf.c')
| -rw-r--r-- | net/netfilter/nft_osf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nft_osf.c b/net/netfilter/nft_osf.c index 70820c66b59131..7f61506e5b44bd 100644 --- a/net/netfilter/nft_osf.c +++ b/net/netfilter/nft_osf.c @@ -23,7 +23,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs, struct nft_osf *priv = nft_expr_priv(expr); u32 *dest = ®s->data[priv->dreg]; struct sk_buff *skb = pkt->skb; - char os_match[NFT_OSF_MAXGENRELEN + 1]; + char os_match[NFT_OSF_MAXGENRELEN]; const struct tcphdr *tcp; struct nf_osf_data data; struct tcphdr _tcph; @@ -45,7 +45,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs, } if (!nf_osf_find(skb, nf_osf_fingers, priv->ttl, &data)) { - strncpy((char *)dest, "unknown", NFT_OSF_MAXGENRELEN); + strscpy_pad((char *)dest, "unknown", NFT_OSF_MAXGENRELEN); } else { if (priv->flags & NFT_OSF_F_VERSION) snprintf(os_match, NFT_OSF_MAXGENRELEN, "%s:%s", @@ -53,7 +53,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs, else strscpy(os_match, data.genre, NFT_OSF_MAXGENRELEN); - strncpy((char *)dest, os_match, NFT_OSF_MAXGENRELEN); + strscpy_pad((char *)dest, os_match, NFT_OSF_MAXGENRELEN); } } |