From owner-svn-src-stable@freebsd.org  Wed Mar  2 13:38:22 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6E85ABF3E8;
 Wed,  2 Mar 2016 13:38:22 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 99CF61A5E;
 Wed,  2 Mar 2016 13:38:22 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u22DcLDf017866;
 Wed, 2 Mar 2016 13:38:21 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u22DcL9l017864;
 Wed, 2 Mar 2016 13:38:21 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201603021338.u22DcL9l017864@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 2 Mar 2016 13:38:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r296311 - in stable/10: sbin/ipfw sys/netpfil/ipfw
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Mar 2016 13:38:22 -0000

Author: ae
Date: Wed Mar  2 13:38:21 2016
New Revision: 296311
URL: https://svnweb.freebsd.org/changeset/base/296311

Log:
  MFC r295969:
    Fix bug in filling and handling ipfw's O_DSCP opcode.
    Due to integer overflow CS4 token was handled as BE.
  
    PR:		207459
  Approved by:	re (gjb)

Modified:
  stable/10/sbin/ipfw/ipfw2.c
  stable/10/sys/netpfil/ipfw/ip_fw2.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/ipfw/ipfw2.c
==============================================================================
--- stable/10/sbin/ipfw/ipfw2.c	Wed Mar  2 11:18:17 2016	(r296310)
+++ stable/10/sbin/ipfw/ipfw2.c	Wed Mar  2 13:38:21 2016	(r296311)
@@ -779,7 +779,7 @@ fill_dscp(ipfw_insn *cmd, char *av, int 
 				errx(EX_DATAERR, "Invalid DSCP value");
 		}
 
-		if (code > 32)
+		if (code >= 32)
 			*high |= 1 << (code - 32);
 		else
 			*low |= 1 << code;

Modified: stable/10/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- stable/10/sys/netpfil/ipfw/ip_fw2.c	Wed Mar  2 11:18:17 2016	(r296310)
+++ stable/10/sys/netpfil/ipfw/ip_fw2.c	Wed Mar  2 13:38:21 2016	(r296311)
@@ -1678,7 +1678,7 @@ do {								\
 					break;
 
 				/* DSCP bitmask is stored as low_u32 high_u32 */
-				if (x > 32)
+				if (x >= 32)
 					match = *(p + 1) & (1 << (x - 32));
 				else
 					match = *p & (1 << x);