diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-25 20:02:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-25 20:02:51 -0500 |
| commit | d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34 (patch) | |
| tree | 794bd9737e15ecc636e2e3ef4c060c8e24488ca3 /net/ax25/af_ax25.c | |
| parent | aa99c47933d2c9a7622440d1b08ebb46ad8bd741 (diff) | |
| parent | 083735f4b01b703184c0e11c2e384b2c60a8aea4 (diff) | |
| download | op-kernel-dev-d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34.zip op-kernel-dev-d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
More work from Al Viro to move away from modifying iovecs
by using iov_iter instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25/af_ax25.c')
| -rw-r--r-- | net/ax25/af_ax25.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index f4f835e..ca049a7 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -1549,7 +1549,7 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock, skb_reserve(skb, size - len); /* User data follows immediately after the AX.25 data */ - if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) { + if (memcpy_from_msg(skb_put(skb, len), msg, len)) { err = -EFAULT; kfree_skb(skb); goto out; |
