From patchwork Wed Jan 15 07:31:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick McHardy X-Patchwork-Id: 310989 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AAA622C0097 for ; Wed, 15 Jan 2014 18:31:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751512AbaAOHb3 (ORCPT ); Wed, 15 Jan 2014 02:31:29 -0500 Received: from stinky.trash.net ([213.144.137.162]:41655 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751261AbaAOHb3 (ORCPT ); Wed, 15 Jan 2014 02:31:29 -0500 Received: from macbook.localnet (unknown [127.0.0.1]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by stinky.trash.net (Postfix) with ESMTPS id 2586E9D2E7; Wed, 15 Jan 2014 08:31:27 +0100 (MET) Date: Wed, 15 Jan 2014 07:31:25 +0000 From: Patrick McHardy To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH libnftables]: expr/cmp: fix type size Message-ID: <20140115073124.GA17045@macbook.localnet> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Pushed to next-3.14. commit 3177a0d6f4be42775c128c02afe7de78dc3ea99d Author: Patrick McHardy 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 --- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/expr/cmp.c b/src/expr/cmp.c index 246f22f..1c5787e 100644 --- a/src/expr/cmp.c +++ b/src/expr/cmp.c @@ -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 diff --git a/src/expr/meta.c b/src/expr/meta.c index 490d64a..74ecdb3 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -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 */ }; };