projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'microblaze-3.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze
[firefly-linux-kernel-4.4.55.git]
/
net
/
netrom
/
af_netrom.c
diff --git
a/net/netrom/af_netrom.c
b/net/netrom/af_netrom.c
index 7e13f6afcd1fb774264a3fa890603fc1c633baaf..69f1d5e9959f23646e82686cf5d17e1685c34c4f 100644
(file)
--- a/
net/netrom/af_netrom.c
+++ b/
net/netrom/af_netrom.c
@@
-1113,7
+1113,7
@@
static int nr_sendmsg(struct kiocb *iocb, struct socket *sock,
skb_put(skb, len);
/* User data follows immediately after the NET/ROM transport header */
skb_put(skb, len);
/* User data follows immediately after the NET/ROM transport header */
- if (memcpy_from
iovec(skb_transport_header(skb), msg->msg_iov
, len)) {
+ if (memcpy_from
_msg(skb_transport_header(skb), msg
, len)) {
kfree_skb(skb);
err = -EFAULT;
goto out;
kfree_skb(skb);
err = -EFAULT;
goto out;