Commit 85cea17d authored by Mina Almasry's avatar Mina Almasry Committed by Jakub Kicinski
Browse files

net: devmem: preserve sockc_err 



Preserve the error code returned by sock_cmsg_send and return that on
err.

Signed-off-by: default avatarMina Almasry <almasrymina@google.com>
Acked-by: default avatarStanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250523230524.1107879-4-almasrymina@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 170ebc60

net/ipv4/tcp.c

+10 −14
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
	int flags, err, copied = 0;

	int mss_now = 0, size_goal, copied_syn = 0;

	int process_backlog = 0;

	bool sockc_valid = true;

	int sockc_err = 0;

	int zc = 0;

	long timeo;
@@ -1075,13 +1075,10 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 


	sockc = (struct sockcm_cookie){ .tsflags = READ_ONCE(sk->sk_tsflags) };

	if (msg->msg_controllen) {

		err = sock_cmsg_send(sk, msg, &sockc);

		if (unlikely(err))

			/* Don't return error until MSG_FASTOPEN has been

			 * processed; that may succeed even if the cmsg is

			 * invalid.

		sockc_err = sock_cmsg_send(sk, msg, &sockc);

		/* Don't return error until MSG_FASTOPEN has been processed;

		 * that may succeed even if the cmsg is invalid.

		 */

			sockc_valid = false;

	}



	if ((flags & MSG_ZEROCOPY) && size) {
@@ -1092,7 +1089,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
		} else if (sock_flag(sk, SOCK_ZEROCOPY)) {

			skb = tcp_write_queue_tail(sk);

			uarg = msg_zerocopy_realloc(sk, size, skb_zcopy(skb),

						    sockc_valid && !!sockc.dmabuf_id);

						    !sockc_err && sockc.dmabuf_id);

			if (!uarg) {

				err = -ENOBUFS;

				goto out_err;
@@ -1102,7 +1099,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
			else

				uarg_to_msgzc(uarg)->zerocopy = 0;



			if (sockc_valid && sockc.dmabuf_id) {

			if (!sockc_err && sockc.dmabuf_id) {

				binding = net_devmem_get_binding(sk, sockc.dmabuf_id);

				if (IS_ERR(binding)) {

					err = PTR_ERR(binding);
@@ -1116,7 +1113,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
			zc = MSG_SPLICE_PAGES;

	}



	if (sockc_valid && sockc.dmabuf_id &&

	if (!sockc_err && sockc.dmabuf_id &&

	    (!(flags & MSG_ZEROCOPY) || !sock_flag(sk, SOCK_ZEROCOPY))) {

		err = -EINVAL;

		goto out_err;
@@ -1160,9 +1157,8 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
		/* 'common' sending to sendq */

	}



	if (!sockc_valid) {

		if (!err)

			err = -EINVAL;

	if (sockc_err) {

		err = sockc_err;

		goto out_err;

	}