From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12C8B396B79 for ; Thu, 16 Apr 2026 11:32:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776339171; cv=none; b=dt0xZtvYtO5hoKu6qa32tx1z25VeYbPSieo2RQWxFSnEfVZHHF1wF5tEEZB3g777+4SccAMjrJzRHoZ47N0zRrR6optzwCDKnh0JNMX+RZKPNEsIF30kba4Bm5/38p5kL0O0huGIepc883yhXijzA2vnpu+yfAEzGeNH7S6Qeuk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776339171; c=relaxed/simple; bh=LthEZFquLxYnf3eWuf9b/raQUnsAIxOokNNsZ6zhLcQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fkjqfVwS4cv51qjPHot6+sxOzcgRfbZcQrUHtsHb8Ot19Zv8rosWfFWGV3sktSesTLqwavf+6dJ+B7WwcBU9lOpsWA6WYFTi/ptiX0DwHqUuVxCHmN221bh7L1zsq8CFbyK+RrXysjpZDmSy8rLJpGCnV2i/7qIAuJV6wpOsWVA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LqfbuVGR; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LqfbuVGR" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2a3e79fe2b8so5586705ad.1 for ; Thu, 16 Apr 2026 04:32:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776339169; x=1776943969; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GkJWBH61iYRdnXJ2r0XjRioP0rvUjxtyWtkR0Sw12W8=; b=LqfbuVGRN4tKOLo+re9EjEGBl1qDT8zAuCKO8M0swFjDgKL6RNd1gCfLrWS3ygcZJF Tsf5WGjxPUpIs85vEOB/m2xJ1TD6P3XeYF1Exjk7QAVSMVDHUXvEY8QlCHGS36SLMTzk VrZG+wZ6kmoX5/4lCN7r4RzRskvTgT43pf5UCbuKO0TyK4fRkzbDMYJ1mc6+/RGIPG1U 4Av68kK/f1tFnOQJcFvh+FO3zbEKQmGuZpad9Gh14W9SU/sc0MBhgKxlr5Q10pAcyn5v Uc429B//wvSxtSAmXP12XbchzlDJFo1t7pqu06+AUvj/QqXdy77XZQhAAENUI5OXqFpY gpjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776339169; x=1776943969; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GkJWBH61iYRdnXJ2r0XjRioP0rvUjxtyWtkR0Sw12W8=; b=iLoucM/FKJpk5QU2roYf3Bu7so784TR40olxLn4eZu0WprGJPa0CuOFPkRnTkXW5YB G5OyZBEQmGUzidrxAwFcWTUrxEnxcb+ptfMTLpcz8TDCmWI6TiAoMOtRRpTu9x5fzwtS r18PnSGaqNXOBPgyWxNQOUuKkL1IziTQMVIyNGovfbgjKS6wfLl5FmgUzv1AjQDpHLLC JY5gdR9ToRroSh2+Ch9Xb2D/cYhle38kRKPb7Q6ts/zLA0MbqxdYY9szp29K0PUnh7Xc btxkhdmo+bxuwpIsDWZ7j4FEfSEC0Jt25vkaOcaG6yCgoArojYUJK8bZEhPPcb4Bb9XB L2FQ== X-Forwarded-Encrypted: i=1; AFNElJ+EY2XpD1UNASgZ2ad9MYMblxLF+JkT441hEISISQv3jX4TsXS13Wh0FXDJSDE2k/dkYVcNR/A=@vger.kernel.org X-Gm-Message-State: AOJu0YyI/73L76v4+BrlZy/GFo5rMqmBfMtCzx0IyGYwBHEbOEpcm7ut jK6uNNb997M4y5U3M/z3ygT9nz5wDzSGszdKU0i6R+jh2g6RMC+nndLo X-Gm-Gg: AeBDieu9zwB0lAuxxWXFnIwIOf08BhpD5wVoZOqtWR2tIrEFKaoKfpM+75/YKDkHpwY hIQvFBLsZ4ZROo3EvTRrpv80Cuje64xP8cFzC/2cMmfeRdANfkEIIGG/XnxObmBawS7figrngCE wx2YdtYaLtf4NIEEK1aW9BVd81EKOncjXlsEyELgOS04M+Zl5P4r5YqM9jEMSojkwnm3CW4cOFV GaP1vPQ8rFZLmauMJvRN/yk2TtWj9M9C0fji6g55dqHJiXFKhTAoTErK7hVRNSHtAaGeju0KDpY ydqE8qOIJo5XJq+ZRXaC69TuZ8HyAbjFz+a3Uc9PHgKg72p1iTYMfafP1H+Wylww+fWbTtbfUan bbF4ttRaDcCRm4NrgEbXV0rmURVsOADOjMCrBAx0oYvo+yHqma8Nap58YiJincurbHB3a1oBw4J rD0CjK0EDFP2ancVkTMrjhO3WanHM= X-Received: by 2002:a17:903:2284:b0:2b0:4d17:4d6e with SMTP id d9443c01a7336-2b5ed9c944cmr14013835ad.3.1776339169437; Thu, 16 Apr 2026 04:32:49 -0700 (PDT) Received: from kali ([2402:e280:3d7c:a2:536a:b505:93f5:9d5d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b47810ae96sm68463125ad.21.2026.04.16.04.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Apr 2026 04:32:49 -0700 (PDT) From: Pavitra Jha To: w@1wt.eu Cc: pabeni@redhat.com, chandrashekar.devegowda@intel.com, linux-wwan@lists.linux.dev, netdev@vger.kernel.org, stable@vger.kernel.org, Pavitra Jha Subject: [PATCH v4] net: wwan: t7xx: validate port_count against message length in t7xx_port_enum_msg_handler Date: Thu, 16 Apr 2026 07:32:05 -0400 Message-ID: <20260416113205.1789319-1-jhapavitra98@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit t7xx_port_enum_msg_handler() uses the modem-supplied port_count field as a loop bound over port_msg->data[] without checking that the message buffer contains sufficient data. A modem sending port_count=65535 in a 12-byte buffer triggers a slab-out-of-bounds read of up to 262140 bytes. Add a struct_size() check after extracting port_count and before the loop. Pass msg_len to t7xx_port_enum_msg_handler() and use it to validate the message size before accessing port_msg->data[]. Pass msg_len from both call sites: skb->len at the DPMAIF path after skb_pull(), and the captured rt_feature->data_len at the handshake path. Fixes: 39d439047f1d ("net: wwan: t7xx: Add control DMA interface") Cc: stable@vger.kernel.org Signed-off-by: Pavitra Jha --- drivers/net/wwan/t7xx/t7xx_modem_ops.c | 14 +++++++------- drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c | 12 +++++++++--- drivers/net/wwan/t7xx/t7xx_port_proxy.h | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/net/wwan/t7xx/t7xx_modem_ops.c b/drivers/net/wwan/t7xx/t7xx_modem_ops.c index 7968e208d..d0559fe16 100644 --- a/drivers/net/wwan/t7xx/t7xx_modem_ops.c +++ b/drivers/net/wwan/t7xx/t7xx_modem_ops.c @@ -453,25 +453,25 @@ static int t7xx_parse_host_rt_data(struct t7xx_fsm_ctl *ctl, struct t7xx_sys_inf { enum mtk_feature_support_type ft_spt_st, ft_spt_cfg; struct mtk_runtime_feature *rt_feature; + size_t feat_data_len; int i, offset; offset = sizeof(struct feature_query); for (i = 0; i < FEATURE_COUNT && offset < data_length; i++) { rt_feature = data + offset; - offset += sizeof(*rt_feature) + le32_to_cpu(rt_feature->data_len); - + feat_data_len = le32_to_cpu(rt_feature->data_len); + offset += sizeof(*rt_feature) + feat_data_len; ft_spt_cfg = FIELD_GET(FEATURE_MSK, core->feature_set[i]); if (ft_spt_cfg != MTK_FEATURE_MUST_BE_SUPPORTED) continue; ft_spt_st = FIELD_GET(FEATURE_MSK, rt_feature->support_info); if (ft_spt_st != MTK_FEATURE_MUST_BE_SUPPORTED) return -EINVAL; - if (i == RT_ID_MD_PORT_ENUM || i == RT_ID_AP_PORT_ENUM) - t7xx_port_enum_msg_handler(ctl->md, rt_feature->data); + if (i == RT_ID_MD_PORT_ENUM || i == RT_ID_AP_PORT_ENUM) { + t7xx_port_enum_msg_handler(ctl->md, rt_feature->data, + feat_data_len); + } } return 0; } diff --git a/drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c b/drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c index ae632ef96..d984a688d 100644 --- a/drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c +++ b/drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c @@ -124,8 +124,9 @@ static int fsm_ee_message_handler(struct t7xx_port *port, struct t7xx_fsm_ctl *c * * 0 - Success. * * -EFAULT - Message check failure. + * @msg_len: Length of @msg in bytes. */ -int t7xx_port_enum_msg_handler(struct t7xx_modem *md, void *msg) +int t7xx_port_enum_msg_handler(struct t7xx_modem *md, void *msg, size_t msg_len) { struct device *dev = &md->t7xx_dev->pdev->dev; unsigned int version, port_count, i; @@ -141,6 +141,13 @@ int t7xx_port_enum_msg_handler(struct t7xx_modem *md, void *msg) } port_count = FIELD_GET(PORT_MSG_PRT_CNT, le32_to_cpu(port_msg->info)); + + if (msg_len < struct_size(port_msg, data, port_count)) { + dev_err(dev, "Port enum msg too short: need %zu, have %zu\n", + struct_size(port_msg, data, port_count), msg_len); + return -EINVAL; + } + for (i = 0; i < port_count; i++) { u32 port_info = le32_to_cpu(port_msg->data[i]); unsigned int ch_id; @@ -154,7 +161,6 @@ int t7xx_port_enum_msg_handler(struct t7xx_modem *md, void *msg) return 0; } static int control_msg_handler(struct t7xx_port *port, struct sk_buff *skb) { const struct t7xx_port_conf *port_conf = port->port_conf; @@ -191,7 +197,7 @@ static int control_msg_handler(struct t7xx_port *port, struct sk_buff *skb) case CTL_ID_PORT_ENUM: skb_pull(skb, sizeof(*ctrl_msg_h)); - ret = t7xx_port_enum_msg_handler(ctl->md, (struct port_msg *)skb->data); + ret = t7xx_port_enum_msg_handler(ctl->md, (struct port_msg *)skb->data, skb->len); if (!ret) ret = port_ctl_send_msg_to_md(port, CTL_ID_PORT_ENUM, 0); else diff --git a/drivers/net/wwan/t7xx/t7xx_port_proxy.h b/drivers/net/wwan/t7xx/t7xx_port_proxy.h index f0918b36e..7c3190bf0 100644 --- a/drivers/net/wwan/t7xx/t7xx_port_proxy.h +++ b/drivers/net/wwan/t7xx/t7xx_port_proxy.h @@ -103,7 +103,7 @@ void t7xx_port_proxy_reset(struct port_proxy *port_prox); void t7xx_port_proxy_uninit(struct port_proxy *port_prox); int t7xx_port_proxy_init(struct t7xx_modem *md); void t7xx_port_proxy_md_status_notify(struct port_proxy *port_prox, unsigned int state); -int t7xx_port_enum_msg_handler(struct t7xx_modem *md, void *msg); +int t7xx_port_enum_msg_handler(struct t7xx_modem *md, void *msg, size_t msg_len); int t7xx_port_proxy_chl_enable_disable(struct port_proxy *port_prox, unsigned int ch_id, bool en_flag); void t7xx_port_proxy_set_cfg(struct t7xx_modem *md, enum port_cfg_id cfg_id); -- 2.53.0