netfilter: nft_osf: use NFT_OSF_MAXGENRELEN instead of IFNAMSIZ

As no "genre" on pf.os exceed 16 bytes of length, we reduce NFT_OSF_MAXGENRELEN parameter to 16 bytes and use it instead of IFNAMSIZ.

Fernando Fernandez Mancera committed 8 years ago

Commit 35a8a3b1 parent 98146702 files · +4 −5Browse files

Unified · Split

2 files

@@ -8,6 +8,7 @@ · 7 unmodified lines
8	#define NFT_SET_MAXNAMELEN NFT_NAME_MAXLEN	8	#define NFT_SET_MAXNAMELEN NFT_NAME_MAXLEN
9	#define NFT_OBJ_MAXNAMELEN NFT_NAME_MAXLEN	9	#define NFT_OBJ_MAXNAMELEN NFT_NAME_MAXLEN
10	#define NFT_USERDATA_MAXLEN 256	10	#define NFT_USERDATA_MAXLEN 256
		11	#define NFT_OSF_MAXGENRELEN 16
11		12
12	/**	13	/**
13	* enum nft_registers - nf_tables registers	14	* enum nft_registers - nf_tables registers

 #include <net/netfilter/nf_tables.h>
 #include <linux/netfilter/nfnetlink_osf.h>
-#define OSF_GENRE_SIZE		32
 struct nft_osf {
 	enum nft_registers	dreg:8;
 };
 	os_name = nf_osf_find(skb, nf_osf_fingers);
 	if (!os_name)
-		strncpy((char *)dest, "unknown", IFNAMSIZ);
+		strncpy((char *)dest, "unknown", NFT_OSF_MAXGENRELEN);
 	else
-		strncpy((char *)dest, os_name, IFNAMSIZ);
+		strncpy((char *)dest, os_name, NFT_OSF_MAXGENRELEN);
 }
 static int nft_osf_init(const struct nft_ctx *ctx,
 	priv->dreg = nft_parse_register(tb[NFTA_OSF_DREG]);
 	err = nft_validate_register_store(ctx, priv->dreg, NULL,
-					  NFTA_DATA_VALUE, OSF_GENRE_SIZE);
+					  NFTA_DATA_VALUE, NFT_OSF_MAXGENRELEN);
 	if (err < 0)
 		return err;