netfilter: nft_meta: refactor deprecated strncpy

Prefer `strscpy_pad` to `strncpy`.

Signed-off-by: Justin Stitt <justinstitt@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 8fdc731..f7da7c4 100644 (file)
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -185,12 +185,12 @@ static noinline bool nft_meta_get_eval_kind(enum nft_meta_keys key,
        case NFT_META_IIFKIND:
                if (!in || !in->rtnl_link_ops)
                        return false;
-               strncpy((char *)dest, in->rtnl_link_ops->kind, IFNAMSIZ);
+               strscpy_pad((char *)dest, in->rtnl_link_ops->kind, IFNAMSIZ);
                break;
        case NFT_META_OIFKIND:
                if (!out || !out->rtnl_link_ops)
                        return false;
-               strncpy((char *)dest, out->rtnl_link_ops->kind, IFNAMSIZ);
+               strscpy_pad((char *)dest, out->rtnl_link_ops->kind, IFNAMSIZ);
                break;
        default:
                return false;
@@ -206,7 +206,7 @@ static void nft_meta_store_ifindex(u32 *dest, const struct net_device *dev)
 
 static void nft_meta_store_ifname(u32 *dest, const struct net_device *dev)
 {
-       strncpy((char *)dest, dev ? dev->name : "", IFNAMSIZ);
+       strscpy_pad((char *)dest, dev ? dev->name : "", IFNAMSIZ);
 }
 
 static bool nft_meta_store_iftype(u32 *dest, const struct net_device *dev)