From c971780a32691e055d1b88164b352ab47b8c01d4 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Mon, 18 Jun 2007 19:59:16 -0400 Subject: [PATCH] --- yaml --- r: 58105 b: refs/heads/master c: 186e234358ba29a4094d0c8c0d3ea00f84d32a3e h: refs/heads/master i: 58103: b95d65eb6b9c02b8a1d1b4db46993a4bbea4189f v: v3 --- [refs] | 2 +- trunk/net/sctp/socket.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 878fc67dec9a..63376873e544 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 408f22e81ea2fcf96c80e85ee12d20ef5148bf7c +refs/heads/master: 186e234358ba29a4094d0c8c0d3ea00f84d32a3e diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index c1f239ac12b9..2fc036699d48 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -4019,8 +4019,7 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len, return -EINVAL; to = optval + offsetof(struct sctp_getaddrs,addrs); - space_left = len - sizeof(struct sctp_getaddrs) - - offsetof(struct sctp_getaddrs,addrs); + space_left = len - offsetof(struct sctp_getaddrs,addrs); list_for_each(pos, &asoc->peer.transport_addr_list) { from = list_entry(pos, struct sctp_transport, transports); @@ -4327,8 +4326,8 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len, } to = optval + offsetof(struct sctp_getaddrs,addrs); - space_left = len - sizeof(struct sctp_getaddrs) - - offsetof(struct sctp_getaddrs,addrs); + space_left = len - offsetof(struct sctp_getaddrs,addrs); + addrs = kmalloc(space_left, GFP_KERNEL); if (!addrs) return -ENOMEM;