From 46961c2ff5619b7149fd458397170cb798ed1d12 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 23 Jan 2020 10:44:46 +0100 Subject: sys/linux: fix more netlink warnings Handle NLA_BITFIELD32. Match string attribtues better. Calculate and check min size for varlen structs. Fix NLA_UNSPEC size check. Fix some things in descriptions. Update #590 --- sys/linux/socket_netlink_xfrm.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/linux/socket_netlink_xfrm.txt') diff --git a/sys/linux/socket_netlink_xfrm.txt b/sys/linux/socket_netlink_xfrm.txt index d646be655..5dc0442f9 100644 --- a/sys/linux/socket_netlink_xfrm.txt +++ b/sys/linux/socket_netlink_xfrm.txt @@ -135,11 +135,11 @@ xfrma_policy [ offload nlattr[XFRMA_OFFLOAD_DEV, xfrm_user_offload] sec_ctx nlattr[XFRMA_SEC_CTX, xfrm_user_sec_ctx] lifetime_val nlattr[XFRMA_LTIME_VAL, xfrm_lifetime_cur] - tmpl nlattr[XFRMA_TMPL, array[xfrm_user_tmpl]] + tmpl nlattr[XFRMA_TMPL, array[xfrm_user_tmpl, 1:XFRM_MAX_DEPTH]] replay_val nlattr[XFRMA_REPLAY_VAL, xfrm_replay_state] replay_esn_val nlattr[XFRMA_REPLAY_ESN_VAL, xfrm_replay_state_esn] policy_type nlattr[XFRMA_POLICY_TYPE, xfrm_userpolicy_type] - migrate nlattr[XFRMA_MIGRATE, array[xfrm_user_migrate]] + migrate nlattr[XFRMA_MIGRATE, array[xfrm_user_migrate, 1:XFRM_MAX_DEPTH]] user_kmaddress nlattr[XFRMA_KMADDRESS, xfrm_user_kmaddress] mark nlattr[XFRMA_MARK, xfrm_mark] proto nlattr[XFRMA_PROTO, flags[xfrm_proto, int8]] @@ -149,6 +149,8 @@ xfrma_policy [ XFRMA_IF_ID nlattr[XFRMA_IF_ID, ifindex] ] [varlen] +define XFRM_MAX_DEPTH 6 + xfrma_spd_policy [ XFRMA_SPD_IPV4_HTHRESH nlattr[XFRMA_SPD_IPV4_HTHRESH, xfrmu_spdhthresh[32]] XFRMA_SPD_IPV6_HTHRESH nlattr[XFRMA_SPD_IPV6_HTHRESH, xfrmu_spdhthresh[128]] -- cgit mrf-deployment