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

netfilter: nft_meta: refactor deprecated strncpy 



Prefer `strscpy_pad` to `strncpy`.

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

net/netfilter/nft_meta.c

+3 −3
Original line number Diff line number Diff line
@@ -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)