Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db5980d8 authored by John Fastabend's avatar John Fastabend Committed by David S. Miller
Browse files

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: 306b13eb ("proto_ops: Add locked held versions of sendmsg and sendpage")
Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45f91bdc

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ int skb_send_sock_locked(struct sock *sk, struct sk_buff *skb, int offset, 


		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);

net/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -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);