From patchwork Fri Nov 15 14:19:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 291578 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 CE53B2C00BA for ; Sat, 16 Nov 2013 01:19:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751617Ab3KOOTz (ORCPT ); Fri, 15 Nov 2013 09:19:55 -0500 Received: from mail.us.es ([193.147.175.20]:54328 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751275Ab3KOOTy (ORCPT ); Fri, 15 Nov 2013 09:19:54 -0500 Received: (qmail 593 invoked from network); 15 Nov 2013 15:19:53 +0100 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 15 Nov 2013 15:19:53 +0100 Received: (qmail 10661 invoked by uid 507); 15 Nov 2013 14:19:53 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98/18114. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-97.6/7.5):. Processed in 1.759421 secs); 15 Nov 2013 14:19:53 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-97.6 required=7.5 tests=BAYES_50,RCVD_IN_BRBL, RCVD_IN_BRBL_LASTEXT,RCVD_IN_PBL,RCVD_IN_RP_RNBL,RCVD_IN_SORBS_DUL, RDNS_DYNAMIC, SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS12715 188.76.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 15 Nov 2013 14:19:51 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/412/antivirus2); Fri, 15 Nov 2013 15:19:51 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus2) Received: (qmail 9405 invoked from network); 15 Nov 2013 15:19:51 +0100 Received: from 20.152.76.188.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@188.76.152.20) by mail.us.es with SMTP; 15 Nov 2013 15:19:51 +0100 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH] expr: match: fix wrong flag setting in nft_rule_expr_match_parse Date: Fri, 15 Nov 2013 15:19:45 +0100 Message-Id: <1384525185-6675-1-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Expression flags were incorrectly set. It should not manifest in any bug as NFTA_MATCH_* and NFT_EXPR_MT_* are overlapping. Still incorrect from the semantic side. Reported-by: Ana Rey Botello Signed-off-by: Pablo Neira Ayuso --- src/expr/match.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/expr/match.c b/src/expr/match.c index 5d02ee7..c7863b8 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -140,12 +140,12 @@ static int nft_rule_expr_match_parse(struct nft_rule_expr *e, struct nlattr *att mnl_attr_get_str(tb[NFTA_MATCH_NAME])); match->name[XT_EXTENSION_MAXNAMELEN-1] = '\0'; - e->flags |= (1 << NFTA_MATCH_NAME); + e->flags |= (1 << NFT_EXPR_MT_NAME); } if (tb[NFTA_MATCH_REV]) { match->rev = ntohl(mnl_attr_get_u32(tb[NFTA_MATCH_REV])); - e->flags |= (1 << NFTA_MATCH_REV); + e->flags |= (1 << NFT_EXPR_MT_REV); } if (tb[NFTA_MATCH_INFO]) { @@ -164,7 +164,7 @@ static int nft_rule_expr_match_parse(struct nft_rule_expr *e, struct nlattr *att match->data = match_data; match->data_len = len; - e->flags |= (1 << NFTA_MATCH_INFO); + e->flags |= (1 << NFT_EXPR_MT_INFO); } return 0;