From patchwork Thu Jul 6 14:25:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 785180 X-Patchwork-Delegate: pablo@netfilter.org 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 3x3Klq0K6Kz9ryk for ; Fri, 7 Jul 2017 00:25:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751801AbdGFOZm (ORCPT ); Thu, 6 Jul 2017 10:25:42 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:35849 "EHLO mail.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751741AbdGFOZl (ORCPT ); Thu, 6 Jul 2017 10:25:41 -0400 Received: from mail.nwl.cc (orbyte.nwl.cc [127.0.0.1]) by mail.nwl.cc (Postfix) with ESMTP id 1AE85644D6; Thu, 6 Jul 2017 16:25:40 +0200 (CEST) Received: from xsao (localhost [IPv6:::1]) by mail.nwl.cc (Postfix) with ESMTP id E6C5A637C4; Thu, 6 Jul 2017 16:25:39 +0200 (CEST) From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [nft PATCH] segtree: Fix expr_value_cmp() Date: Thu, 6 Jul 2017 16:25:28 +0200 Message-Id: <20170706142528.19715-1-phil@nwl.cc> X-Mailer: git-send-email 2.13.1 X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Instead of returning the result of mpz_cmp(), this function returned 1 unless both elements were equal and the first one had EXPR_F_INTERVAL_END set. Signed-off-by: Phil Sutter --- src/segtree.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/segtree.c b/src/segtree.c index a2316a7b98041..f53536210018d 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -602,10 +602,12 @@ static int expr_value_cmp(const void *p1, const void *p2) int ret; ret = mpz_cmp(expr_value(e1)->value, expr_value(e2)->value); - if (ret == 0 && (e1->flags & EXPR_F_INTERVAL_END)) - return -1; - else - return 1; + if (ret == 0) { + if (e1->flags & EXPR_F_INTERVAL_END) + return -1; + else if (e2->flags & EXPR_F_INTERVAL_END) + return 1; + } return ret; }