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>

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index cb12359..917da73 100644 (file)
--- 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 b332d1e..c729625 100644 (file)
--- 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);