From 2f6be2ad41ae842241a2eeb9a5227ca433ea5792 Mon Sep 17 00:00:00 2001
From: yamt <yamt@NetBSD.org>
Date: Sun, 15 Apr 2007 05:25:48 +0000
Subject: [PATCH] - soabort: don't leak a socket on error. - add an assertion.

---
 sys/kern/uipc_socket.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index f4fcb8771645..968c0e4055ad 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.138 2007/04/03 23:44:53 rmind Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.139 2007/04/15 05:25:48 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.138 2007/04/03 23:44:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.139 2007/04/15 05:25:48 yamt Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -636,9 +636,15 @@ soclose(struct socket *so)
 int
 soabort(struct socket *so)
 {
+	int error;
 
-	return (*so->so_proto->pr_usrreq)(so, PRU_ABORT, (struct mbuf *)0,
+	KASSERT(so->so_head == NULL);
+	error = (*so->so_proto->pr_usrreq)(so, PRU_ABORT, (struct mbuf *)0,
 	    (struct mbuf *)0, (struct mbuf *)0, (struct lwp *)0);
+	if (error) {
+		sofree(so);
+	}
+	return error;
 }
 
 int