From: Hui Peng <benquike@gmail.com>
To: mani@kernel.org, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com
Cc: horms@kernel.org, linux-arm-msm@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] net: qrtr: ns: validate msglen and sq_port in qrtr_ns_worker() and ctrl_cmd_bye()
Date: Sat, 19 Sep 2026 21:28:50 +0000 [thread overview]
Message-ID: <20260919212850.3240353-1-benquike@gmail.com> (raw)
Two validation checks are missing in the QRTR in-kernel nameservice
(`net/qrtr/ns.c`):
1. `qrtr_ns_worker()` receives control packets into a single reused
4096-byte `recv_buf` via `kernel_recvmsg()` without checking that
`msglen >= sizeof(*pkt)` (20 bytes). If a short packet arrives on
`qrtr_ns.sock`, `qrtr_ns_worker()` reads stale bytes from previous
control messages (or uninitialized heap memory on the first packet)
when parsing `pkt->cmd` and its union fields.
2. Unlike `ctrl_cmd_del_client()`, `ctrl_cmd_bye()` does not verify that
`from->sq_port == QRTR_PORT_CTRL`, allowing any unprivileged local
`AF_QIPCRTR` socket to send a `QRTR_TYPE_BYE` packet and purge all
registered services for the local node.
Check `msglen < sizeof(*pkt)` in `qrtr_ns_worker()` and require
`from->sq_port == QRTR_PORT_CTRL` in `ctrl_cmd_bye()`.
Fixes: 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace")
Assisted-by: LLM
Signed-off-by: Hui Peng <benquike@gmail.com>
---
net/qrtr/ns.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
index bcb090ee79d4..d7e1a37f0717 100644
--- a/net/qrtr/ns.c
+++ b/net/qrtr/ns.c
@@ -347,6 +347,9 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from)
iv.iov_base = &pkt;
iv.iov_len = sizeof(pkt);
+ if (from->sq_port != QRTR_PORT_CTRL)
+ return -EINVAL;
+
node = node_get(from->sq_node);
if (!node)
return 0;
@@ -639,6 +642,9 @@ static void qrtr_ns_worker(struct work_struct *work)
break;
}
+ if (msglen < sizeof(*pkt))
+ continue;
+
pkt = recv_buf;
cmd = le32_to_cpu(pkt->cmd);
if (cmd < ARRAY_SIZE(qrtr_ctrl_pkt_strings) &&
--
2.55.0.1082.g2b9226bbc0-goog
reply other threads:[~2026-09-19 21:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260919212850.3240353-1-benquike@gmail.com \
--to=benquike@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mani@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®