From owner-cvs-src-old@FreeBSD.ORG Thu Jul 8 12:20:40 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AA55106566B for ; Thu, 8 Jul 2010 12:20:40 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 197CA8FC20 for ; Thu, 8 Jul 2010 12:20:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o68CKdeZ036918 for ; Thu, 8 Jul 2010 12:20:39 GMT (envelope-from glebius@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o68CKdXi036917 for cvs-src-old@freebsd.org; Thu, 8 Jul 2010 12:20:39 GMT (envelope-from glebius@repoman.freebsd.org) Message-Id: <201007081220.o68CKdXi036917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to glebius@repoman.freebsd.org using -f From: Gleb Smirnoff Date: Thu, 8 Jul 2010 12:20:15 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sys/netinet/ipfw ip_fw2.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jul 2010 12:20:40 -0000 glebius 2010-07-08 12:20:15 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sys/netinet/ipfw ip_fw2.c Log: SVN rev 209795 on 2010-07-08 12:20:15Z by glebius Merge 209589 from head: After processing the O_SKIPTO opcode our cmd points to the next rule, and "match" processing at the end of inner loop would look ahead into the next rule, which is incorrect. Particularly, in the case when the next rule started with F_NOT opcode it was skipped blindly. To fix this, exit the inner loop with the continue operator forcibly and explicitly. PR: kern/147798 Revision Changes Path 1.11.2.9 +3 -2 src/sys/netinet/ipfw/ip_fw2.c