Ver Fonte

[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>
Vlad Yasevich há 18 anos atrás
pai
commit
70b57b814e
1 ficheiros alterados com 8 adições e 4 exclusões
  1. 8 4
      net/sctp/socket.c

+ 8 - 4
net/sctp/socket.c

@@ -4164,6 +4164,7 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
 	rwlock_t *addr_lock;
 	rwlock_t *addr_lock;
 	int err = 0;
 	int err = 0;
 	void *addrs;
 	void *addrs;
+	void *buf;
 	int bytes_copied = 0;
 	int bytes_copied = 0;
 
 
 	if (len != sizeof(struct sctp_getaddrs_old))
 	if (len != sizeof(struct sctp_getaddrs_old))
@@ -4217,13 +4218,14 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
 		}
 		}
 	}
 	}
 
 
+	buf = addrs;
 	list_for_each(pos, &bp->address_list) {
 	list_for_each(pos, &bp->address_list) {
 		addr = list_entry(pos, struct sctp_sockaddr_entry, list);
 		addr = list_entry(pos, struct sctp_sockaddr_entry, list);
 		memcpy(&temp, &addr->a, sizeof(temp));
 		memcpy(&temp, &addr->a, sizeof(temp));
 		sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp);
 		sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp);
 		addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
 		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;
 		bytes_copied += addrlen;
 		cnt ++;
 		cnt ++;
 		if (cnt >= getaddrs.addr_num) break;
 		if (cnt >= getaddrs.addr_num) break;
@@ -4266,6 +4268,7 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
 	size_t space_left;
 	size_t space_left;
 	int bytes_copied = 0;
 	int bytes_copied = 0;
 	void *addrs;
 	void *addrs;
+	void *buf;
 
 
 	if (len <= sizeof(struct sctp_getaddrs))
 	if (len <= sizeof(struct sctp_getaddrs))
 		return -EINVAL;
 		return -EINVAL;
@@ -4316,6 +4319,7 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
 		}
 		}
 	}
 	}
 
 
+	buf = addrs;
 	list_for_each(pos, &bp->address_list) {
 	list_for_each(pos, &bp->address_list) {
 		addr = list_entry(pos, struct sctp_sockaddr_entry, list);
 		addr = list_entry(pos, struct sctp_sockaddr_entry, list);
 		memcpy(&temp, &addr->a, sizeof(temp));
 		memcpy(&temp, &addr->a, sizeof(temp));
@@ -4325,8 +4329,8 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
 			err =  -ENOMEM; /*fixme: right error?*/
 			err =  -ENOMEM; /*fixme: right error?*/
 			goto error;
 			goto error;
 		}
 		}
-		memcpy(addrs, &temp, addrlen);
-		to += addrlen;
+		memcpy(buf, &temp, addrlen);
+		buf += addrlen;
 		bytes_copied += addrlen;
 		bytes_copied += addrlen;
 		cnt ++;
 		cnt ++;
 		space_left -= addrlen;
 		space_left -= addrlen;