Module Name: src
Committed By: bouyer
Date: Wed Jun 17 20:29:33 UTC 2009
Modified Files:
src/sys/netinet [netbsd-5]: tcp_usrreq.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #812):
sys/netinet/tcp_usrreq.c: revision 1.155
sysctl_inpcblist: fix a lock leak in error path (hi <matt>).
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.149.4.1 src/sys/netinet/tcp_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.149 src/sys/netinet/tcp_usrreq.c:1.149.4.1
--- src/sys/netinet/tcp_usrreq.c:1.149 Sat Oct 11 13:40:57 2008
+++ src/sys/netinet/tcp_usrreq.c Wed Jun 17 20:29:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.149 2008/10/11 13:40:57 pooka Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.149.4.1 2009/06/17 20:29:33 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.149 2008/10/11 13:40:57 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.149.4.1 2009/06/17 20:29:33 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1553,8 +1553,10 @@
if (len >= elem_size && elem_count > 0) {
error = copyout(&pcb, dp, out_size);
- if (error)
+ if (error) {
+ mutex_exit(softnet_lock);
return (error);
+ }
dp += elem_size;
len -= elem_size;
}
