From owner-freebsd-bugs@FreeBSD.ORG Mon Oct 13 20:20:22 2003 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3FD816A4C2 for ; Mon, 13 Oct 2003 20:20:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87E4D43FD7 for ; Mon, 13 Oct 2003 20:20:20 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9E3KKFY027073 for ; Mon, 13 Oct 2003 20:20:20 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9E3KKpO027072; Mon, 13 Oct 2003 20:20:20 -0700 (PDT) (envelope-from gnats) Resent-Date: Mon, 13 Oct 2003 20:20:20 -0700 (PDT) Resent-Message-Id: <200310140320.h9E3KKpO027072@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Scot Loach Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E7DB016A4B3 for ; Mon, 13 Oct 2003 20:11:51 -0700 (PDT) Received: from mail.sandvine.com (sandvine.com [199.243.201.138]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AB2E43F3F for ; Mon, 13 Oct 2003 20:11:51 -0700 (PDT) (envelope-from sloach@sandvine.com) Received: from bsd-make.sandvine.com ([192.168.1.38]) by mail.sandvine.com with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13) id 4CQ6NA4V; Mon, 13 Oct 2003 23:11:49 -0400 Received: by bsd-make.sandvine.com (Postfix, from userid 11195) id AD1F7411; Mon, 13 Oct 2003 23:11:49 -0400 (EDT) Message-Id: <20031014031149.AD1F7411@bsd-make.sandvine.com> Date: Mon, 13 Oct 2003 23:11:49 -0400 (EDT) From: Scot Loach To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: kern/57985: [patch] Missing splx in ether_output_frame (-stable) X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Scot Loach List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Oct 2003 03:20:22 -0000 >Number: 57985 >Category: kern >Synopsis: [patch] Missing splx in ether_output_frame (-stable) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Oct 13 20:20:20 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Scot Loach >Release: FreeBSD 4.8-RELEASE-p3 i386 >Organization: Sandvine Incorporated >Environment: >Description: In /sys/net/if_ethersubr.c, in ether_output_frame, there is a return for an error case that fails to call splx to release the splimp taken above. (see the included patch) >How-To-Repeat: >Fix: Index: if_ethersubr.c =================================================================== RCS file: /cvs/src/sys/net/if_ethersubr.c,v retrieving revision 1.70.2.30.1000.3 diff -U10 -r1.70.2.30.1000.3 if_ethersubr.c --- if_ethersubr.c 21 Jun 2003 20:47:55 -0000 1.70.2.30.1000.3 +++ if_ethersubr.c 14 Oct 2003 02:13:58 -0000 @@ -410,20 +410,21 @@ no_bridge: s = splimp(); if (IPFW_LOADED && ether_ipfw != 0) { struct ether_header save_eh, *eh; eh = mtod(m, struct ether_header *); save_eh = *eh; m_adj(m, ETHER_HDR_LEN); if (ether_ipfw_chk(&m, ifp, &rule, eh, 0) == 0) { if (m) { + splx(s); m_freem(m); return ENOBUFS; /* pkt dropped */ } else return 0; /* consumed e.g. in a pipe */ } >Release-Note: >Audit-Trail: >Unformatted: