From owner-cvs-all Fri Dec 27 9:15:18 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 586D437B401; Fri, 27 Dec 2002 09:15:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 056BC43EA9; Fri, 27 Dec 2002 09:15:17 -0800 (PST) (envelope-from iedowse@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBRHFGfh029268; Fri, 27 Dec 2002 09:15:16 -0800 (PST) (envelope-from iedowse@repoman.freebsd.org) Received: (from iedowse@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBRHFGVT029267; Fri, 27 Dec 2002 09:15:16 -0800 (PST) Message-Id: <200212271715.gBRHFGVT029267@repoman.freebsd.org> From: Ian Dowse Date: Fri, 27 Dec 2002 09:15:16 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/net bridge.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG iedowse 2002/12/27 09:15:16 PST Modified files: sys/net bridge.c Log: Oops, I misread the purpose of the NULL check in EH_RESTORE() in revision 1.62. It was checking for M_PREPEND() failing, not for the case of a NULL mbuf pointer being supplied to the macro. Back out that revision, and fix the NULL dereference by not calling EH_RESTORE() in the case where the mbuf pointer is NULL because the firewall rejected the packet. Revision Changes Path 1.63 +3 -2 src/sys/net/bridge.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message