| From 70b57b814ed5a93bf21d9dc5f8a7d23620a77e44 Mon Sep 17 00:00:00 2001 |
| Date: Wed, 9 May 2007 13:51:31 -0700 |
| Message-ID: <464C5462.4020407@hp.com> |
| From: Vlad Yasevich <vladislav.yasevich@hp.com> |
| Subject: SCTP: Correctly copy addresses in sctp_copy_laddrs |
| |
| I broke the non-wildcard case recently. This is to fixes it. |
| Now, explictitly bound addresses can ge retrieved using the API. |
| |
| Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| --- |
| net/sctp/socket.c | 12 ++++++++---- |
| 1 file changed, 8 insertions(+), 4 deletions(-) |
| |
| --- linux-2.6.21.1.orig/net/sctp/socket.c |
| +++ linux-2.6.21.1/net/sctp/socket.c |
| @@ -4016,6 +4016,7 @@ static int sctp_getsockopt_local_addrs_o |
| rwlock_t *addr_lock; |
| int err = 0; |
| void *addrs; |
| + void *buf; |
| int bytes_copied = 0; |
| |
| if (len != sizeof(struct sctp_getaddrs_old)) |
| @@ -4069,13 +4070,14 @@ static int sctp_getsockopt_local_addrs_o |
| } |
| } |
| |
| + buf = addrs; |
| list_for_each(pos, &bp->address_list) { |
| addr = list_entry(pos, struct sctp_sockaddr_entry, list); |
| memcpy(&temp, &addr->a, sizeof(temp)); |
| sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp); |
| addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; |
| - memcpy(addrs, &temp, addrlen); |
| - to += addrlen; |
| + memcpy(buf, &temp, addrlen); |
| + buf += addrlen; |
| bytes_copied += addrlen; |
| cnt ++; |
| if (cnt >= getaddrs.addr_num) break; |
| @@ -4118,6 +4120,7 @@ static int sctp_getsockopt_local_addrs(s |
| size_t space_left; |
| int bytes_copied = 0; |
| void *addrs; |
| + void *buf; |
| |
| if (len <= sizeof(struct sctp_getaddrs)) |
| return -EINVAL; |
| @@ -4168,6 +4171,7 @@ static int sctp_getsockopt_local_addrs(s |
| } |
| } |
| |
| + buf = addrs; |
| list_for_each(pos, &bp->address_list) { |
| addr = list_entry(pos, struct sctp_sockaddr_entry, list); |
| memcpy(&temp, &addr->a, sizeof(temp)); |
| @@ -4177,8 +4181,8 @@ static int sctp_getsockopt_local_addrs(s |
| err = -ENOMEM; /*fixme: right error?*/ |
| goto error; |
| } |
| - memcpy(addrs, &temp, addrlen); |
| - to += addrlen; |
| + memcpy(buf, &temp, addrlen); |
| + buf += addrlen; |
| bytes_copied += addrlen; |
| cnt ++; |
| space_left -= addrlen; |