Date: Wed, 2 Mar 2016 13:54:44 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r296312 - in stable/9: sbin/ipfw sys/netpfil/ipfw Message-ID: <201603021354.u22Dsi30024165@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Wed Mar 2 13:54:43 2016 New Revision: 296312 URL: https://svnweb.freebsd.org/changeset/base/296312 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 Modified: stable/9/sbin/ipfw/ipfw2.c stable/9/sys/netpfil/ipfw/ip_fw2.c Directory Properties: stable/9/sbin/ipfw/ (props changed) stable/9/sys/ (props changed) stable/9/sys/netpfil/ (props changed) Modified: stable/9/sbin/ipfw/ipfw2.c ============================================================================== --- stable/9/sbin/ipfw/ipfw2.c Wed Mar 2 13:38:21 2016 (r296311) +++ stable/9/sbin/ipfw/ipfw2.c Wed Mar 2 13:54:43 2016 (r296312) @@ -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/9/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw2.c Wed Mar 2 13:38:21 2016 (r296311) +++ stable/9/sys/netpfil/ipfw/ip_fw2.c Wed Mar 2 13:54:43 2016 (r296312) @@ -1679,7 +1679,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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603021354.u22Dsi30024165>