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 /crypto | |
| parent | 227158db160449b6513d2e31894a135104b90e90 (diff) | |
new helper: memcpy_from_msg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algif_skcipher.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 83187f497c7c..c3b482bee208 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c | |||
| @@ -298,9 +298,9 @@ static int skcipher_sendmsg(struct kiocb *unused, struct socket *sock, | |||
| 298 | len = min_t(unsigned long, len, | 298 | len = min_t(unsigned long, len, |
| 299 | PAGE_SIZE - sg->offset - sg->length); | 299 | PAGE_SIZE - sg->offset - sg->length); |
| 300 | 300 | ||
| 301 | err = memcpy_fromiovec(page_address(sg_page(sg)) + | 301 | err = memcpy_from_msg(page_address(sg_page(sg)) + |
| 302 | sg->offset + sg->length, | 302 | sg->offset + sg->length, |
| 303 | msg->msg_iov, len); | 303 | msg, len); |
| 304 | if (err) | 304 | if (err) |
| 305 | goto unlock; | 305 | goto unlock; |
| 306 | 306 | ||
| @@ -337,8 +337,8 @@ static int skcipher_sendmsg(struct kiocb *unused, struct socket *sock, | |||
| 337 | if (!sg_page(sg + i)) | 337 | if (!sg_page(sg + i)) |
| 338 | goto unlock; | 338 | goto unlock; |
| 339 | 339 | ||
| 340 | err = memcpy_fromiovec(page_address(sg_page(sg + i)), | 340 | err = memcpy_from_msg(page_address(sg_page(sg + i)), |
| 341 | msg->msg_iov, plen); | 341 | msg, plen); |
| 342 | if (err) { | 342 | if (err) { |
| 343 | __free_page(sg_page(sg + i)); | 343 | __free_page(sg_page(sg + i)); |
| 344 | sg_assign_page(sg + i, NULL); | 344 | sg_assign_page(sg + i, NULL); |