Module Name: src
Committed By: rmind
Date: Sun Jun 7 16:20:29 UTC 2009
Modified Files:
src/sys/netinet: tcp_usrreq.c
Log Message:
sysctl_inpcblist: fix a lock leak in error path (hi <matt>).
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 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.154 src/sys/netinet/tcp_usrreq.c:1.155
--- src/sys/netinet/tcp_usrreq.c:1.154 Fri Apr 17 01:48:22 2009
+++ src/sys/netinet/tcp_usrreq.c Sun Jun 7 16:20:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.154 2009/04/17 01:48:22 elad Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.155 2009/06/07 16:20:29 rmind 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.154 2009/04/17 01:48:22 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.155 2009/06/07 16:20:29 rmind Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1544,8 +1544,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;
}