diff options
| author | David S. Miller | 2014-11-26 02:02:51 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-11-26 02:02:51 +0100 |
| commit | d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34 (patch) | |
| tree | 794bd9737e15ecc636e2e3ef4c060c8e24488ca3 /net/ipv4/tcp_input.c | |
| parent | net: Hyper-V: Deletion of an unnecessary check before the function call "vfree" (diff) | |
| parent | rds: switch rds_message_copy_from_user() to iov_iter (diff) | |
| download | kernel-qcow2-linux-d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34.tar.gz kernel-qcow2-linux-d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34.tar.xz kernel-qcow2-linux-d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34.zip | |
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/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d22a31f27ab4..69de1a1c05c9 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4368,7 +4368,7 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size) if (tcp_try_rmem_schedule(sk, skb, skb->truesize)) goto err_free; - if (memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size)) + if (memcpy_from_msg(skb_put(skb, size), msg, size)) goto err_free; TCP_SKB_CB(skb)->seq = tcp_sk(sk)->rcv_nxt; |