Commit 7d11e047 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by Jakub Kicinski
Browse files

net: do not write to msg_get_inq in callee 

NULL pointer dereference fix.

msg_get_inq is an input field from caller to callee. Don't set it in
the callee, as the caller may not clear it on struct reuse.

This is a kernel-internal variant of msghdr only, and the only user
does reinitialize the field. So this is not critical for that reason.
But it is more robust to avoid the write, and slightly simpler code.
And it fixes a bug, see below.

Callers set msg_get_inq to request the input queue length to be
returned in msg_inq. This is equivalent to but independent from the
SO_INQ request to return that same info as a cmsg (tp->recvmsg_inq).
To reduce branching in the hot path the second also sets the msg_inq.
That is WAI.

This is a fix to commit 4d144297 ("af_unix: don't post cmsg for
SO_INQ unless explicitly asked for"), which fixed the inverse.

Also avoid NULL pointer dereference in unix_stream_read_generic if
state->msg is NULL and msg->msg_get_inq is written. A NULL state->msg
can happen when splicing as of commit 2b514574 ("net: af_unix:
implement splice for stream af_unix sockets").

Also collapse two branches using a bitwise or.

Cc: stable@vger.kernel.org
Fixes: 4d144297 ("af_unix: don't post cmsg for SO_INQ unless explicitly asked for")
Link: https://lore.kernel.org/netdev/willemdebruijn.kernel.24d8030f7a3de@gmail.com/


Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20260106150626.3944363-1-willemdebruijn.kernel@gmail.com


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

net/ipv4/tcp.c

+3 −5
Original line number Diff line number Diff line
@@ -2652,10 +2652,8 @@ static int tcp_recvmsg_locked(struct sock *sk, struct msghdr *msg, size_t len, 
	if (sk->sk_state == TCP_LISTEN)

		goto out;



	if (tp->recvmsg_inq) {

	if (tp->recvmsg_inq)

		*cmsg_flags = TCP_CMSG_INQ;

		msg->msg_get_inq = 1;

	}

	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);



	/* Urgent data needs to be handled specially. */
@@ -2929,10 +2927,10 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags, 
	ret = tcp_recvmsg_locked(sk, msg, len, flags, &tss, &cmsg_flags);

	release_sock(sk);



	if ((cmsg_flags || msg->msg_get_inq) && ret >= 0) {

	if ((cmsg_flags | msg->msg_get_inq) && ret >= 0) {

		if (cmsg_flags & TCP_CMSG_TS)

			tcp_recv_timestamp(msg, sk, &tss);

		if (msg->msg_get_inq) {

		if ((cmsg_flags & TCP_CMSG_INQ) | msg->msg_get_inq) {

			msg->msg_inq = tcp_inq_hint(sk);

			if (cmsg_flags & TCP_CMSG_INQ)

				put_cmsg(msg, SOL_TCP, TCP_CM_INQ,

net/unix/af_unix.c

+3 −5
Original line number Diff line number Diff line
@@ -2904,7 +2904,6 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state, 
	unsigned int last_len;

	struct unix_sock *u;

	int copied = 0;

	bool do_cmsg;

	int err = 0;

	long timeo;

	int target;
@@ -2930,9 +2929,6 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state, 


	u = unix_sk(sk);



	do_cmsg = READ_ONCE(u->recvmsg_inq);

	if (do_cmsg)

		msg->msg_get_inq = 1;

redo:

	/* Lock the socket to prevent queue disordering

	 * while sleeps in memcpy_tomsg
@@ -3090,9 +3086,11 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state, 


	mutex_unlock(&u->iolock);

	if (msg) {

		bool do_cmsg = READ_ONCE(u->recvmsg_inq);



		scm_recv_unix(sock, msg, &scm, flags);



		if (msg->msg_get_inq && (copied ?: err) >= 0) {

		if ((do_cmsg | msg->msg_get_inq) && (copied ?: err) >= 0) {

			msg->msg_inq = READ_ONCE(u->inq_len);

			if (do_cmsg)

				put_cmsg(msg, SOL_SOCKET, SCM_INQ,