Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58105
b: refs/heads/master
c: 186e234
h: refs/heads/master
i:
  58103: b95d65e
v: v3
  • Loading branch information
Neil Horman authored and Vlad Yasevich committed Jun 19, 2007
1 parent 65e3189 commit c971780
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 408f22e81ea2fcf96c80e85ee12d20ef5148bf7c
refs/heads/master: 186e234358ba29a4094d0c8c0d3ea00f84d32a3e
7 changes: 3 additions & 4 deletions trunk/net/sctp/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c971780

Please sign in to comment.