diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-10 21:17:23 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-10 21:17:23 +0300 |
| commit | 6e5f59aacbf9527dfe425541c78cb8c56623e7eb (patch) | |
| tree | dc5614e1546dba2bd6896d4aa21410e1d3297a09 /net/tipc | |
| parent | 6c702fab626328c33b539b0c618a5511aed23bed (diff) | |
| parent | 218321e7a0838c2be974539f0a5341b398d4432b (diff) | |
| download | linux-6e5f59aacbf9527dfe425541c78cb8c56623e7eb.tar.xz | |
Merge branch 'for-davem-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
More iov_iter work for the networking from Al Viro.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/msg.c b/net/tipc/msg.c index 5b0659791c07..a687b30a699c 100644 --- a/net/tipc/msg.c +++ b/net/tipc/msg.c @@ -194,7 +194,7 @@ int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset, __skb_queue_tail(list, skb); skb_copy_to_linear_data(skb, mhdr, mhsz); pktpos = skb->data + mhsz; - if (!dsz || !memcpy_fromiovecend(pktpos, m->msg_iov, offset, + if (!dsz || !memcpy_fromiovecend(pktpos, m->msg_iter.iov, offset, dsz)) return dsz; rc = -EFAULT; @@ -224,7 +224,7 @@ int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset, if (drem < pktrem) pktrem = drem; - if (memcpy_fromiovecend(pktpos, m->msg_iov, offset, pktrem)) { + if (memcpy_fromiovecend(pktpos, m->msg_iter.iov, offset, pktrem)) { rc = -EFAULT; goto error; } |