diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-06 21:25:44 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-24 04:28:48 -0500 |
commit | 6ce8e9ce5989ae13f493062975304700be86d20e (patch) | |
tree | b714f34723d37ccd90bb5350555cbfe9dc8b9abe /net/sctp | |
parent | 227158db160449b6513d2e31894a135104b90e90 (diff) |
new helper: memcpy_from_msg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/sm_make_chunk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 9f32741abb1c..e49bccebb0cc 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
@@ -1001,7 +1001,7 @@ no_mem: | |||
1001 | 1001 | ||
1002 | /* Helper to create ABORT with a SCTP_ERROR_USER_ABORT error. */ | 1002 | /* Helper to create ABORT with a SCTP_ERROR_USER_ABORT error. */ |
1003 | struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *asoc, | 1003 | struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *asoc, |
1004 | const struct msghdr *msg, | 1004 | struct msghdr *msg, |
1005 | size_t paylen) | 1005 | size_t paylen) |
1006 | { | 1006 | { |
1007 | struct sctp_chunk *retval; | 1007 | struct sctp_chunk *retval; |
@@ -1018,7 +1018,7 @@ struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *asoc, | |||
1018 | if (!payload) | 1018 | if (!payload) |
1019 | goto err_payload; | 1019 | goto err_payload; |
1020 | 1020 | ||
1021 | err = memcpy_fromiovec(payload, msg->msg_iov, paylen); | 1021 | err = memcpy_from_msg(payload, msg, paylen); |
1022 | if (err < 0) | 1022 | if (err < 0) |
1023 | goto err_copy; | 1023 | goto err_copy; |
1024 | } | 1024 | } |