Skip to content

Commit db5980d

Browse files
jrfastabdavem330
authored andcommitted
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: 306b13e ("proto_ops: Add locked held versions of sendmsg and sendpage") Signed-off-by: John Fastabend <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 45f91bd commit db5980d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

net/core/skbuff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2285,7 +2285,7 @@ int skb_send_sock_locked(struct sock *sk, struct sk_buff *skb, int offset,
22852285

22862286
slen = min_t(int, len, skb_headlen(skb) - offset);
22872287
kv.iov_base = skb->data + offset;
2288-
kv.iov_len = len;
2288+
kv.iov_len = slen;
22892289
memset(&msg, 0, sizeof(msg));
22902290

22912291
ret = kernel_sendmsg_locked(sk, &msg, &kv, 1, slen);

net/socket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ int kernel_sendmsg_locked(struct sock *sk, struct msghdr *msg,
658658
struct socket *sock = sk->sk_socket;
659659

660660
if (!sock->ops->sendmsg_locked)
661-
sock_no_sendmsg_locked(sk, msg, size);
661+
return sock_no_sendmsg_locked(sk, msg, size);
662662

663663
iov_iter_kvec(&msg->msg_iter, WRITE | ITER_KVEC, vec, num, size);
664664

0 commit comments

Comments
 (0)