Skip to contentSkip to conversation

net: do not write to msg_get_inq in caller

PATCH In review Willem de Bruijn 3 participants 9 messages Jan 5

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: do not write to msg_get_inq in caller

From: Willem de Bruijn <[email protected]>

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.

But it is more robust to avoid the write, and slightly simpler code.

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 small follow-on to commit 4d1442979e4a ("af_unix: don't post cmsg for SO_INQ unless explicitly asked for"), which fixed the inverse.

Also collapse two branches using a bitwise or.

---
 net/ipv4/tcp.c     | 8 +++-----
 net/unix/af_unix.c | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)
net/ipv4/tcp.c +3 -5
index f035440c475a..d5319ebe2452 100644
@@ -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
index a7ca74653d94..d0511225799b 100644
@@ -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,
Signature · 1 line
2.52.0.351.gbe84eed79e-goog
#1 lore raw
Quoted 21 lines · Willem de Bruijn

From: Willem de Bruijn <[email protected]>

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.

But it is more robust to avoid the write, and slightly simpler code.

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 small follow-on to commit 4d1442979e4a ("af_unix: don't post cmsg for SO_INQ unless explicitly asked for"), which fixed the inverse.

Quoted 5 lines

Also collapse two branches using a bitwise or.

---

Patch looks sane to me, but the title is a bit confusing, I guess you meant

"net: do not write to msg_get_inq in callee" ?

Also, unix_stream_read_generic() is currently potentially adding a NULL deref if u->recvmsg_inq is non zero, but msg is NULL ?

If this is the case we need a Fixes: tag.

#2 lore raw
Quoted 4 lines · Eric Dumazet

Also, unix_stream_read_generic() is currently potentially adding a NULL deref if u->recvmsg_inq is non zero, but msg is NULL ?

If this is the case we need a Fixes: tag.

Good catch - might make sense to queue this patch for 6.19, then?

Signature · 1 line
Jens Axboe
#3 lore raw
In reply to Eric Dumazet
Quoted 25 lines · Eric Dumazet
Quoted 23 lines · Willem de Bruijn

From: Willem de Bruijn <[email protected]>

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.

But it is more robust to avoid the write, and slightly simpler code.

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 small follow-on to commit 4d1442979e4a ("af_unix: don't post cmsg for SO_INQ unless explicitly asked for"), which fixed the inverse.

Also collapse two branches using a bitwise or.

Quoted 7 lines
Quoted 3 lines

---

Patch looks sane to me, but the title is a bit confusing, I guess you meant

"net: do not write to msg_get_inq in callee" ?

Indeed, thanks. Will fix.

Quoted 5 lines

Also, unix_stream_read_generic() is currently potentially adding a NULL deref if u->recvmsg_inq is non zero, but msg is NULL ?

If this is the case we need a Fixes: tag.

Oh good point. state->msg can be NULL as of commit 2b514574f7e8 ("net:
af_unix: implement splice for stream af_unix sockets"). That commit mentions "we mostly have to deal with a non-existing struct msghdr argument".

Okay. Will resubmit to net with a Fixes tag (after the usual 24hrs).

Thanks!

#4 lore raw
Quoted 40 lines · Willem de Bruijn
Quoted 25 lines · Eric Dumazet
Quoted 23 lines · On Mon, Jan 5, 2026 at 5:33?PM Willem de Bruijn…

From: Willem de Bruijn <[email protected]>

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.

But it is more robust to avoid the write, and slightly simpler code.

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 small follow-on to commit 4d1442979e4a ("af_unix: don't post cmsg for SO_INQ unless explicitly asked for"), which fixed the inverse.

Also collapse two branches using a bitwise or.

Quoted 7 lines
Quoted 3 lines

---

Patch looks sane to me, but the title is a bit confusing, I guess you meant

"net: do not write to msg_get_inq in callee" ?

Indeed, thanks. Will fix.

Quoted 4 lines

Also, unix_stream_read_generic() is currently potentially adding a NULL deref if u->recvmsg_inq is non zero, but msg is NULL ?

Quoted 6 lines
Quoted 1 line

If this is the case we need a Fixes: tag.

Oh good point. state->msg can be NULL as of commit 2b514574f7e8 ("net:
af_unix: implement splice for stream af_unix sockets"). That commit mentions "we mostly have to deal with a non-existing struct msghdr argument".

Worth noting that this is currently not possible, as io_uring should be the only one setting ->recvmsg_inq and it would not do that via splice. Should still be fixed of course.

Signature · 1 line
Jens Axboe
#5 lore raw
Quoted 43 lines · Jens Axboe
Quoted 42 lines · Willem de Bruijn
Quoted 25 lines · Eric Dumazet
Quoted 23 lines · On Mon, Jan 5, 2026 at 5:33?PM Willem de Bruijn…

From: Willem de Bruijn <[email protected]>

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.

But it is more robust to avoid the write, and slightly simpler code.

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 small follow-on to commit 4d1442979e4a ("af_unix: don't post cmsg for SO_INQ unless explicitly asked for"), which fixed the inverse.

Also collapse two branches using a bitwise or.

Quoted 7 lines
Quoted 3 lines

---

Patch looks sane to me, but the title is a bit confusing, I guess you meant

"net: do not write to msg_get_inq in callee" ?

Indeed, thanks. Will fix.

Quoted 5 lines

Also, unix_stream_read_generic() is currently potentially adding a NULL deref if u->recvmsg_inq is non zero, but msg is NULL ?

If this is the case we need a Fixes: tag.

Quoted 8 lines
Quoted 4 lines

Oh good point. state->msg can be NULL as of commit 2b514574f7e8 ("net:
af_unix: implement splice for stream af_unix sockets"). That commit mentions "we mostly have to deal with a non-existing struct msghdr argument".

Worth noting that this is currently not possible, as io_uring should be the only one setting ->recvmsg_inq and it would not do that via splice. Should still be fixed of course.

recvmsg_inq is written from setsockopt SO_INQ. Do you mean msg_get_inq?

I think this is reachable with a setsockopt + splice:

        do_cmsg = READ_ONCE(u->recvmsg_inq);
        if (do_cmsg)
                msg->msg_get_inq = 1;
#6 lore raw
Quoted 54 lines · Willem de Bruijn
Quoted 43 lines · Jens Axboe
Quoted 42 lines · Willem de Bruijn
Quoted 25 lines · Eric Dumazet
Quoted 23 lines · On Mon, Jan 5, 2026 at 5:33?PM Willem de Bruijn…

From: Willem de Bruijn <[email protected]>

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.

But it is more robust to avoid the write, and slightly simpler code.

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 small follow-on to commit 4d1442979e4a ("af_unix: don't post cmsg for SO_INQ unless explicitly asked for"), which fixed the inverse.

Also collapse two branches using a bitwise or.

Quoted 7 lines
Quoted 3 lines

---

Patch looks sane to me, but the title is a bit confusing, I guess you meant

"net: do not write to msg_get_inq in callee" ?

Indeed, thanks. Will fix.

Quoted 5 lines

Also, unix_stream_read_generic() is currently potentially adding a NULL deref if u->recvmsg_inq is non zero, but msg is NULL ?

If this is the case we need a Fixes: tag.

Quoted 8 lines
Quoted 4 lines

Oh good point. state->msg can be NULL as of commit 2b514574f7e8 ("net:
af_unix: implement splice for stream af_unix sockets"). That commit mentions "we mostly have to deal with a non-existing struct msghdr argument".

Worth noting that this is currently not possible, as io_uring should be the only one setting ->recvmsg_inq and it would not do that via splice. Should still be fixed of course.

Quoted 8 lines

recvmsg_inq is written from setsockopt SO_INQ. Do you mean msg_get_inq?

I think this is reachable with a setsockopt + splice:

        do_cmsg = READ_ONCE(u->recvmsg_inq);
        if (do_cmsg)
                msg->msg_get_inq = 1;

It is a bit strange that syzbot did not find it yet.

#7 lore raw
In reply to Willem de Bruijn
Quoted 53 lines · Willem de Bruijn
Quoted 43 lines · Jens Axboe
Quoted 42 lines · Willem de Bruijn
Quoted 25 lines · Eric Dumazet
Quoted 23 lines · On Mon, Jan 5, 2026 at 5:33?PM Willem de Bruijn…

From: Willem de Bruijn <[email protected]>

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.

But it is more robust to avoid the write, and slightly simpler code.

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 small follow-on to commit 4d1442979e4a ("af_unix: don't post cmsg for SO_INQ unless explicitly asked for"), which fixed the inverse.

Also collapse two branches using a bitwise or.

Quoted 7 lines
Quoted 3 lines

---

Patch looks sane to me, but the title is a bit confusing, I guess you meant

"net: do not write to msg_get_inq in callee" ?

Indeed, thanks. Will fix.

Quoted 5 lines

Also, unix_stream_read_generic() is currently potentially adding a NULL deref if u->recvmsg_inq is non zero, but msg is NULL ?

If this is the case we need a Fixes: tag.

Quoted 8 lines
Quoted 4 lines

Oh good point. state->msg can be NULL as of commit 2b514574f7e8 ("net:
af_unix: implement splice for stream af_unix sockets"). That commit mentions "we mostly have to deal with a non-existing struct msghdr argument".

Worth noting that this is currently not possible, as io_uring should be the only one setting ->recvmsg_inq and it would not do that via splice. Should still be fixed of course.

Quoted 8 lines

recvmsg_inq is written from setsockopt SO_INQ. Do you mean msg_get_inq?

I think this is reachable with a setsockopt + splice:

        do_cmsg = READ_ONCE(u->recvmsg_inq);
        if (do_cmsg)
                msg->msg_get_inq = 1;

Indeed you are right, I mixed up the two...

Signature · 1 line
Jens Axboe
Reviewed-by on v1 1/1
#8 lore raw
In reply to Willem de Bruijn
Quoted 16 lines · Willem de Bruijn

From: Willem de Bruijn <[email protected]>

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.

But it is more robust to avoid the write, and slightly simpler code.

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.

Quoted 5 lines

This is a small follow-on to commit 4d1442979e4a ("af_unix: don't post cmsg for SO_INQ unless explicitly asked for"), which fixed the inverse.

Also collapse two branches using a bitwise or.

I also ran my usual testing, and as expected, looks fine as well.

Signature · 1 line
Jens Axboe