From e4c56f390e76bddfd2911006d7036e2970b3f5d1 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 22 Jan 2020 16:38:55 +0100 Subject: tools/syz-check: improve matching netlink attributes 1. Match policies that has a _suffix in our descriptions (we frequently do this to improve precision or avoid dup names). 2. Rename policies in descriptions to match kernel names. 3. Match policy if there are several such names in kernel. 4. Recognize policies with helper sub-policies. Update #590 --- sys/linux/socket_netlink_generic_netlabel.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/linux/socket_netlink_generic_netlabel.txt') diff --git a/sys/linux/socket_netlink_generic_netlabel.txt b/sys/linux/socket_netlink_generic_netlabel.txt index 1ba631874..b06fbc3f0 100644 --- a/sys/linux/socket_netlink_generic_netlabel.txt +++ b/sys/linux/socket_netlink_generic_netlabel.txt @@ -85,16 +85,16 @@ netlbl_cipsov4_genl_policy [ NLBL_CIPSOV4_A_DOI nlattr[NLBL_CIPSOV4_A_DOI, flags[cipso_doi, int32]] NLBL_CIPSOV4_A_MTYPE nlattr[NLBL_CIPSOV4_A_MTYPE, flags[cipsov4_type, int32]] NLBL_CIPSOV4_A_TAGLST nlattr[NLBL_CIPSOV4_A_TAGLST, array[nlattr[NLBL_CIPSOV4_A_TAG, flags[cipsov4_tags, int8]]]] - NLBL_CIPSOV4_A_MLSLVLLST nlattr[NLBL_CIPSOV4_A_MLSLVLLST, array[nlattr[NLBL_CIPSOV4_A_MLSLVL, array[netlbl_cipsov4_mlslvl_policy]]]] - NLBL_CIPSOV4_A_MLSCATLST nlattr[NLBL_CIPSOV4_A_MLSCATLST, array[nlattr[NLBL_CIPSOV4_A_MLSCAT, array[netlbl_cipsov4_mlscat_policy]]]] + NLBL_CIPSOV4_A_MLSLVLLST nlattr[NLBL_CIPSOV4_A_MLSLVLLST, array[nlattr[NLBL_CIPSOV4_A_MLSLVL, array[netlbl_cipsov4_genl_policy_mlslvl]]]] + NLBL_CIPSOV4_A_MLSCATLST nlattr[NLBL_CIPSOV4_A_MLSCATLST, array[nlattr[NLBL_CIPSOV4_A_MLSCAT, array[netlbl_cipsov4_genl_policy_mlscat]]]] ] [varlen] -netlbl_cipsov4_mlslvl_policy [ +netlbl_cipsov4_genl_policy_mlslvl [ NLBL_CIPSOV4_A_MLSLVLLOC nlattr[NLBL_CIPSOV4_A_MLSLVLLOC, int32[0:CIPSO_V4_MAX_LOC_LVLS]] NLBL_CIPSOV4_A_MLSLVLREM nlattr[NLBL_CIPSOV4_A_MLSLVLREM, int32[0:CIPSO_V4_MAX_REM_LVLS]] ] [varlen] -netlbl_cipsov4_mlscat_policy [ +netlbl_cipsov4_genl_policy_mlscat [ NLBL_CIPSOV4_A_MLSCATLOC nlattr[NLBL_CIPSOV4_A_MLSCATLOC, int32[0:CIPSO_V4_MAX_LOC_CATS]] NLBL_CIPSOV4_A_MLSCATREM nlattr[NLBL_CIPSOV4_A_MLSCATREM, int32[0:CIPSO_V4_MAX_REM_CATS]] ] [varlen] -- cgit mrf-deployment