From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=115.124.28.218 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795270759; b=NQ/VhQ3bIbyVQvpWR5JmmrJU+O9Q8vO1brnnWO9utf4rzvr21iZr27MhMBYfFb73vswB ABkdcAqFF0Nop/tORklk8JWrWM0wYUM1Mpl0VOorai3dX8V4JdHF+IoUv429WhCFnCIvI 5hdsX0XQfdOr3KeHcVnR7tfkC9l0W7h3B76tfyynLzxx4p6gfpHIW86u/HsNs9wmU94g/ DThQMnUKpXRREZ1Urf4vJW5r9v9HazK4Sn9RzDd990sSxzgM+x0CtnnIP46LYFe//cCRk rBkEMTSJFOVNJgWzS3dWvDkWwHdwKBPWLWpiY9MQMtvPm2/kQvLeyZps6aTPSslyrYQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795270759; h=DMARC-Filter:DKIM-Signature:X-Alimail-AntiSpam:Received:From:To:Cc: Subject:Date:Message-ID:X-Mailer:MIME-Version: Content-Transfer-Encoding; bh=6lSsSifsq1sG0N4uoNSDpxwOsk+iAPHfrnWDaZky96o=; b=N1gThOTPnlBqzOnMDTTYwlS+cT3wv5qHWUdoK5O9wtLwYY1M8L3DHa9GSaJQn2r8SvBE CDbGowReX1V7bxFRrDgVz2qvQq2TX7wpiFdyYVN38ZAX39ANNMc3ezt90tnFntW0lEqNQ UDYv1oHJZunXn3tmeCBAq74SdebHCCN3n+i0LK5T8OgA5HFKtcxzz6OFJvRw2YGnq4LQe JH4SiXyUQ03sZgW6ACWJqG7vhs3u3j6d0CDw7/XQUi9qlguXlSH4OIb0HMnzO5BYlCJ/S DMAgT+DxshcMkjy8dbFLKh5Zk/UbqJ7kTBW3ygyfjhpii1SBYAIgwiSjL/OLNrrWalw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=xiaopeng.com; spf=pass smtp.mailfrom=xiaopeng.com; dkim=pass header.d=xiaopeng.com header.i=@xiaopeng.com header.a=rsa-sha256 header.s=default header.b=uQRiaJeX; arc=none smtp.remote-ip=115.124.28.218 Received: from out28-218.mail.aliyun.com (out28-218.mail.aliyun.com [115.124.28.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B657606A320; Sat, 21 Nov 2026 14:19:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2B657606A320 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xiaopeng.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xiaopeng.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xiaopeng.com header.i=@xiaopeng.com header.a=rsa-sha256 header.s=default header.b=uQRiaJeX DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=xiaopeng.com; s=default; t=1795270744; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=6lSsSifsq1sG0N4uoNSDpxwOsk+iAPHfrnWDaZky96o=; b=uQRiaJeXGsRTK9QKZJG1pv9pr7oRQvuXqOq6nXT0j2MYHaRGcWGJmAuwHcA6Ivg8yniBSK37tAaDWkxvWjMZlBvyoepmLabtkc3wx4tTCxzKvZdhXUIW7lD6uDtPv6iBgMEMiXhN3MnD6mR4mRRjeTlUyuNyUeicaiUwE7hQth4= X-Alimail-AntiSpam:AC=CONTINUE;BC=0.04437637|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_system_inform|0.0033484-9.11759e-05-0.99656;FP=12542528845588258802|0|0|0|0|-1|-1|-1;HT=maildocker-contentspam033023087102;MF=fangxy@xiaopeng.com;NM=1;PH=DS;RN=14;RT=14;SR=0;TI=SMTPD_---.k7GCETQ_1795270740; Received: from localhost.localdomain(mailfrom:fangxy@xiaopeng.com fp:SMTPD_---.k7GCETQ_1795270740 cluster:ay29) by smtp.aliyun-inc.com; Sat, 21 Nov 2026 22:19:01 +0800 From: Fang Xieyan To: loic.poulain@oss.qualcomm.com, ryazanov.s.a@gmail.com, netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, johannes@sipsolutions.net, maoyixie.tju@gmail.com, zhugl3@xiaopeng.com, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH net v4 0/5] net: wwan: iosm: validate MUX DL lengths and offsets Date: Sat, 21 Nov 2026 22:18:45 +0800 Message-ID: <20261121141850.73754-1-fangxy@xiaopeng.com> X-Mailer: git-send-email 2.50.1 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The MUX downlink decoders trust several modem supplied lengths and offsets without bounding them against what actually arrived: the block size from the transfer descriptor, the ADGH datagram length, the ACBH block length, the command chain offsets and the declared parameter length. A truncated or enlarged DL block makes the driver read past the received data, hand the network stack an undeclared payload, or walk a command chain that loops or redecodes the same bytes. The aggregated datagram block path is already covered by commit 526b8ef54668 ("net: wwan: iosm: bound device offsets in the MUX downlink decoder") and is not touched here. This series adds those bounds. No command type, response or protocol semantics change, so a conforming modem behaves exactly as before. A parameter too short for the member its command type reads is dropped with -EMSGSIZE, which also ends an aggregated block at that command. Patch 4 is the prep change for patch 5; both carry Cc: stable, as patch 5 cannot be backported without patch 4. cmd_len is not a parameter bound in either path. In an aggregated block the boundary is next_cmd_index, or the end of the received block for the last command. In MUX Lite there is one command per skb, so the received length is already everything that command owns; the flow control decoder treats a mismatching cmd_len as a legacy device, so the field is a compatibility flag, not a length bound. Patch 3 bounds the ACBH command chain by the received length rather than block_length. Although the structure describes block_length as the length of the aggregated command block, the uplink encoder initializes it to the ACBH header size and does not update it as commands are appended, so it cannot delimit the received command chain. The field is sanity checked, while first_cmd_index and next_cmd_index are bounded against skb->len. The walk's array_index_nospec() call is removed: it bounded a byte offset by sizeof(struct mux_cmdh), zeroing every legal offset past that size. The offset indexes no array; array_index_nospec() is kept only for if_id, an actual array index. Patch 2 relies on the ADGH header check from patch 1, patch 5 on the ACBH validation from patch 3 and the parameter pointer from patch 4. Every commit applies and builds individually, W=1 drivers/net/wwan/iosm/ is clean. Found by reviewing the DL decode path against the MUX protocol structures, not reproduced on a live modem: reaching it needs a device that truncates or enlarges its own downlink blocks. The series is based on net at 92e97d7cffc7. Changes in v4: - Patch 1 keeps the skb->data test as context again, so the series applies to the net tree, where its removal (66974df65a0b) has not landed. The added length check is unchanged and sits after the test; the two edits do not overlap and merge cleanly once the removal reaches net. Patches 2-5 are unchanged. Changes in v3: - Rebase onto net-next (9068e05d35f3) so the series applies on top of 66974df65a0b ("net: wwan: iosm: drop redundant skb->data check in MUX DL decode"). Patch 1 no longer anchors its signature-length check on the removed skb->data test; the check now sits directly before the signature read. This clears the v2 patchwork context failure at iosm_ipc_mux_codec.c:696 and the dependent context-hw gate failure. - Patch 5 wraps the over-long continuation line in ipc_mux_dl_cmd_decode(): param_len now goes on its own line, clearing the checkpatch "line length of 82 exceeds 80 columns" warning. - Cc Guanglei Zhu, whom get_maintainer.pl now lists for this file after his review of 66974df65a0b (the v2 cc_maintainers warning). Changes in v2, all three points from the Sashiko AI review of v1: - Patch 5 bounds the MUX Lite parameter by the received length alone, not by cmd_len: v1 dropped legacy FLOW_CTL (cmd_len 16..19) and OPEN_SESSION_RESP (16..27) even when the parameter bytes had arrived, defeating the backward compatibility branch in ipc_mux_dl_cmds_decode_process() that exists for exactly these (the protocol minimum for cmd_len is 0x10). - Patch 2 rejects adgh_len == packet_offset too: the zero length clone reached ipc_wwan_receive(), which reads skb->data[0] without checking skb->len. mux_dl_process_dg() already rejects the same case for the aggregated path with dl_head_pad_len >= dg_len. - Patch 4 gains Fixes: 9413491e20e1 and Cc: stable@vger.kernel.org: its by-value signature copied all twelve union bytes even for a four byte response, and patch 5 bounds the session responses, so the two are needed together. A prerequisite itself marked for stable and present in the series need not be listed, per stable-kernel-rules.rst. v2: https://lore.kernel.org/netdev/20261117173940.34970-1-fangxy@xiaopeng.com/ v1: https://lore.kernel.org/netdev/20261112125201.1019-1-fangxy@xiaopeng.com/ Fang Xieyan (5): net: wwan: iosm: validate the MUX DL block length net: wwan: iosm: validate the ADGH datagram length net: wwan: iosm: bound the ACBH command chain walk net: wwan: iosm: pass the DL command parameter by pointer net: wwan: iosm: validate the command parameter length drivers/net/wwan/iosm/iosm_ipc_mux_codec.c | 186 ++++++++++++++++----- 1 file changed, 141 insertions(+), 45 deletions(-) -- 2.50.1