commit | 6ce8e9ce5989ae13f493062975304700be86d20e | [log] [tgz] |
---|---|---|
author | Al Viro <viro@zeniv.linux.org.uk> | Sun Apr 06 21:25:44 2014 -0400 |
committer | Al Viro <viro@zeniv.linux.org.uk> | Mon Nov 24 04:28:48 2014 -0500 |
tree | b714f34723d37ccd90bb5350555cbfe9dc8b9abe | |
parent | 227158db160449b6513d2e31894a135104b90e90 [diff] [blame] |
new helper: memcpy_from_msg() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index c559bcd..cc7a828 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c
@@ -346,8 +346,7 @@ skb_put(skb, 2); /* Copy user data into skb */ - error = memcpy_fromiovec(skb_put(skb, total_len), m->msg_iov, - total_len); + error = memcpy_from_msg(skb_put(skb, total_len), m, total_len); if (error < 0) { kfree_skb(skb); goto error_put_sess_tun;