diff options
| author | John Fastabend <john.fastabend@gmail.com> | 2017-08-15 22:31:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-16 11:27:52 -0700 |
| commit | db5980d804d7158917ad4b9186c78b2a3f1db4ef (patch) | |
| tree | 18ebf25156a017b2c11d0928aa4b9a4cafaae821 | |
| parent | 45f91bdcd5c5ba559a4bb7c3a0e0709476cf570f (diff) | |
| download | linux-db5980d804d7158917ad4b9186c78b2a3f1db4ef.tar.gz linux-db5980d804d7158917ad4b9186c78b2a3f1db4ef.tar.bz2 linux-db5980d804d7158917ad4b9186c78b2a3f1db4ef.zip | |
net: fixes for skb_send_sock
A couple fixes to new skb_send_sock infrastructure. However, no users
currently exist for this code (adding user in next handful of patches)
so it should not be possible to trigger a panic with existing in-kernel
code.
Fixes: 306b13eb3cf9 ("proto_ops: Add locked held versions of sendmsg and sendpage")
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/skbuff.c | 2 | ||||
| -rw-r--r-- | net/socket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index cb123590c674..917da73d3ab3 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2285,7 +2285,7 @@ do_frag_list: slen = min_t(int, len, skb_headlen(skb) - offset); kv.iov_base = skb->data + offset; - kv.iov_len = len; + kv.iov_len = slen; memset(&msg, 0, sizeof(msg)); ret = kernel_sendmsg_locked(sk, &msg, &kv, 1, slen); diff --git a/net/socket.c b/net/socket.c index b332d1e8e4e4..c729625eb5d3 100644 --- a/net/socket.c +++ b/net/socket.c @@ -658,7 +658,7 @@ int kernel_sendmsg_locked(struct sock *sk, struct msghdr *msg, struct socket *sock = sk->sk_socket; if (!sock->ops->sendmsg_locked) - sock_no_sendmsg_locked(sk, msg, size); + return sock_no_sendmsg_locked(sk, msg, size); iov_iter_kvec(&msg->msg_iter, WRITE | ITER_KVEC, vec, num, size); |