svn commit: r296311 - in stable/10: sbin/ipfw sys/netpfil/ipfw

[Andrey V. Elsukov]

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);