netfilter: nft_meta_bridge: Fix get NFT_META_BRI_IIFVPROTO in network byteorder

wenxu · ummakynes · commit daf1de907879 · 2019-08-30T02:49:04.000+02:00
Get the vlan_proto of ingress bridge in network byteorder as userspace expects. Otherwise this is inconsistent with NFT_META_PROTOCOL. Fixes: 2a3a93e ("netfilter: nft_meta_bridge: Add NFT_META_BRI_IIFVPROTO support") Signed-off-by: wenxu <wenxu@ucloud.cn> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git a/net/bridge/netfilter/nft_meta_bridge.c b/net/bridge/netfilter/nft_meta_bridge.c
@@ -53,7 +53,7 @@ static void nft_meta_bridge_get_eval(const struct nft_expr *expr,
 			goto err;
 
 		br_vlan_get_proto(br_dev, &p_proto);
-		nft_reg_store16(dest, p_proto);
+		nft_reg_store16(dest, htons(p_proto));
 		return;
 	}
 	default:

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static void nft_meta_bridge_get_eval(const struct nft_expr *expr,`
`53`	`53`	`goto err;`
`54`	`54`
`55`	`55`	`br_vlan_get_proto(br_dev, &p_proto);`
`56`		`- nft_reg_store16(dest, p_proto);`
	`56`	`+ nft_reg_store16(dest, htons(p_proto));`
`57`	`57`	`return;`
`58`	`58`	`}`
`59`	`59`	`default:`