UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Justin Stitt 2023-08-09 01:06:07 +00:00 committed by Florian Westphal
parent 6d87a4eae8
commit ad156c23d6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netfilter/nft_meta.c
View File

@ -185,12 +185,12 @@ static noinline bool nft_meta_get_eval_kind(enum nft_meta_keys key,
case NFT_META_IIFKIND: case NFT_META_IIFKIND:
if (!in || !in->rtnl_link_ops) if (!in || !in->rtnl_link_ops)
return false; return false;
strncpy((char *)dest, in->rtnl_link_ops->kind, IFNAMSIZ); strscpy_pad((char *)dest, in->rtnl_link_ops->kind, IFNAMSIZ);
break; break;
case NFT_META_OIFKIND: case NFT_META_OIFKIND:
if (!out || !out->rtnl_link_ops) if (!out || !out->rtnl_link_ops)
return false; return false;
strncpy((char *)dest, out->rtnl_link_ops->kind, IFNAMSIZ); strscpy_pad((char *)dest, out->rtnl_link_ops->kind, IFNAMSIZ);
break; break;
default: default:
return false; 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) 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) static bool nft_meta_store_iftype(u32 *dest, const struct net_device *dev)