From d8df193ec6241583de2e5d300beb9f6d570c5aeb Mon Sep 17 00:00:00 2001
From: Sebastian Siewior <sebastian@breakpoint.cc>
Date: Fri, 27 Jul 2007 22:55:59 +0200
Subject: [PATCH] --- yaml --- r: 63619 b: refs/heads/master c:
 d6f9fdaf643eca8fb49fffdd6269b78f4ef1ef86 h: refs/heads/master i:   63617:
 ae93005862b21302c538ddb1e500cfbb4f8a0a5c   63615:
 5e0fa15adc860e3e64ca3ae358dc41329dbef587 v: v3

---
 [refs]                  |  2 +-
 trunk/net/sctp/socket.c | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ecf68be6484e..3dd7a3b42505 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c86dabcf00f3ca167df59f3526a53b3da3ede2c8
+refs/heads/master: d6f9fdaf643eca8fb49fffdd6269b78f4ef1ef86
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
index b31be0994572..be743d4a7c09 100644
--- a/trunk/net/sctp/socket.c
+++ b/trunk/net/sctp/socket.c
@@ -4350,7 +4350,7 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
 						space_left, &bytes_copied);
 			if (cnt < 0) {
 				err = cnt;
-				goto error;
+				goto error_lock;
 			}
 			goto copy_getaddrs;
 		}
@@ -4364,7 +4364,7 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
 		addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
 		if (space_left < addrlen) {
 			err =  -ENOMEM; /*fixme: right error?*/
-			goto error;
+			goto error_lock;
 		}
 		memcpy(buf, &temp, addrlen);
 		buf += addrlen;
@@ -4378,15 +4378,21 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
 
 	if (copy_to_user(to, addrs, bytes_copied)) {
 		err = -EFAULT;
-		goto error;
+		goto out;
 	}
 	if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num)) {
 		err = -EFAULT;
-		goto error;
+		goto out;
 	}
 	if (put_user(bytes_copied, optlen))
 		err = -EFAULT;
-error:
+
+	goto out;
+
+error_lock:
+	sctp_read_unlock(addr_lock);
+
+out:
 	kfree(addrs);
 	return err;
 }