net: do not write to msg_get_inq in callee

commit 7d11e047eda5f98514ae62507065ac961981c025 upstream.

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 4d1442979e4a ("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 2b514574f7e8 ("net: af_unix:
implement splice for stream af_unix sockets").

Also collapse two branches using a bitwise or.

Cc: stable@vger.kernel.org
Fixes: 4d1442979e4a ("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: Willem de Bruijn <willemb@google.com>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20260106150626.3944363-1-willemdebruijn.kernel@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 8a18aeca7ab07480844946120f51a0555699b4c3..74079eab8980407116957371456b7528f16b1fb3 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2651,10 +2651,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. */
@@ -2928,10 +2926,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,

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index f6f01f514933b424658efa8ed1b0c299b7203055..c634a7fc8609067b9463e93084f841380341a17c 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2929,7 +2929,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;
@@ -2955,9 +2954,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
@@ -3115,9 +3111,11 @@ unlock:
 
        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,