From owner-freebsd-bugs@FreeBSD.ORG  Sun Sep 16 09:50:01 2007
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DFC2116A46C
	for <freebsd-bugs@hub.freebsd.org>;
	Sun, 16 Sep 2007 09:50:01 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F97A13C4A8
	for <freebsd-bugs@hub.freebsd.org>;
	Sun, 16 Sep 2007 09:50:01 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l8G9o1D9053995
	for <freebsd-bugs@freefall.freebsd.org>; Sun, 16 Sep 2007 09:50:01 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l8G9o1Xd053994;
	Sun, 16 Sep 2007 09:50:01 GMT (envelope-from gnats)
Resent-Date: Sun, 16 Sep 2007 09:50:01 GMT
Resent-Message-Id: <200709160950.l8G9o1Xd053994@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,
	Arnaud Degroote <degroote@NetBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0487316A417
	for <freebsd-gnats-submit@FreeBSD.org>;
	Sun, 16 Sep 2007 09:46:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id E0F5313C469
	for <freebsd-gnats-submit@FreeBSD.org>;
	Sun, 16 Sep 2007 09:46:49 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l8G9knOo010881
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 16 Sep 2007 09:46:49 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l8G9knAL010880;
	Sun, 16 Sep 2007 09:46:49 GMT (envelope-from nobody)
Message-Id: <200709160946.l8G9knAL010880@www.freebsd.org>
Date: Sun, 16 Sep 2007 09:46:49 GMT
From: Arnaud Degroote <degroote@NetBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc: 
Subject: kern/116392: Interrupt level not restored correctly in
	ip_ipsec_input
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Sep 2007 09:50:02 -0000


>Number:         116392
>Category:       kern
>Synopsis:       Interrupt level not restored correctly in ip_ipsec_input
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 16 09:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Arnaud Degroote
>Release:        HEAD
>Organization:
>Environment:
No freebsd box. Code inspection
>Description:
In ip_ipsec_input and ip6_ipsec_input, in case where sp == NULL, we go out of the function with a return 1 without restoring the right interrupt level.
>How-To-Repeat:
N/A
>Fix:
For ip6_ipsec.c you can use that. The same patch is necessary on ip_ipsec.c

--- ip6_ipsec.orig.c    2007-09-16 11:42:15.000000000 +0200
+++ ip6_ipsec.c 2007-09-16 11:42:35.000000000 +0200
@@ -181,7 +181,6 @@
                        /* XXX error stat??? */
                        error = EINVAL;
                        DPRINTF(("ip_input: no SP, packet discarded\n"));/*XXX*/
-                       return 1;
                }
                splx(s);
                if (error)


>Release-Note:
>Audit-Trail:
>Unformatted: