Skip to contentSkip to conversation

: expr/cmp: fix type size

PATCH New Patrick McHardy 1 participant 1 message Jan 15, 2014 netfilter

lore
Share & tools
lore

Patrick McHardy

author Applied
#0 lore raw

PATCH 1/1 : expr/cmp: fix type size

Pushed to next-3.14.

commit 3177a0d6f4be42775c128c02afe7de78dc3ea99d

Author: Patrick McHardy <[email protected]>
Date:   Wed Jan 15 07:28:20 2014 +0000

expr/cmp: fix type size

Since nftables now uses nft_rule_expr_get_u32(), the internal size must also be a uint32_t.

Fixes complete breakage of any cmp or meta expression.

Signed-off-by Patrick McHardy <[email protected]>
src/expr/cmp.c +2 -2
index 246f22f..1c5787e 100644
@@ -26,8 +26,8 @@
 
 struct nft_expr_cmp {
 	union nft_data_reg	data;
-	uint8_t			sreg;	/* enum nft_registers */
-	uint8_t			op;	/* enum nft_cmp_ops */
+	uint32_t		sreg;	/* enum nft_registers */
+	uint32_t		op;	/* enum nft_cmp_ops */
 };
 
 static int
src/expr/meta.c +3 -3
index 490d64a..74ecdb3 100644
@@ -27,10 +27,10 @@
 #endif
 
 struct nft_expr_meta {
-	uint8_t			key;	/* enum nft_meta_keys */
+	uint32_t		key;	/* enum nft_meta_keys */
 	union {
-		uint8_t		dreg;	/* enum nft_registers */
-		uint8_t		sreg;   /* enum nft_registers */
+		uint32_t	dreg;	/* enum nft_registers */
+		uint32_t	sreg;   /* enum nft_registers */
 	};
 };