From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vs1-f44.google.com (mail-vs1-f44.google.com [209.85.217.44]) (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 C7D0337D126 for ; Wed, 22 Apr 2026 16:05:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776873910; cv=none; b=SwOZjgTt9jpRx/pnomxHWLEaDh+iY2/bDRKkaZJgr6dNWJCOyFfEb6+lnEBX10ACNaziFTkXNDA3NI8rxctA7z+LBCod2ql7vmzVPc+XMHfMsGoPC6W7WZngGKz4+ekA7p5E+wAKdKtwB8Q4gVhiviomLiQ6sOtgB7TvxhFu6ko= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776873910; c=relaxed/simple; bh=VQKE++kSkNnafuk9pDx8+P5r00uAWKMmjuCw7JxQ0NE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BknmKbIlh+dFuFCDwJGeJiSdtDAfWu2UFWXEhLPjcMbATOcGOarUT+UBm5hJOlkXHqfKrpJgBxKkXngNIZBtbBbNl6NJzsnPdBssGulxHnf44H6/hcmL+UNGh1bsDMOLlcxBn8s9G0hEV3Q5mPIOB23adhGU7htZGYpWtb/mpXI= 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=gica2eBG; arc=none smtp.client-ip=209.85.217.44 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="gica2eBG" Received: by mail-vs1-f44.google.com with SMTP id ada2fe7eead31-6108228a851so1930300137.0 for ; Wed, 22 Apr 2026 09:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776873906; x=1777478706; 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=dbIScAHLkzfolps6mpjGZEZ/01fVfgMv8ysDQ0vf3Jk=; b=gica2eBGAKJXaP9LEss1tHCTUHXVXf8+exWJcWNUvCxyZ4HZOB1ZRIe3GEG8V8SZvB Uoo+D8ID1zQQRGbDiL9AptZn445zEe2O0W16viafB/jxwResCBnO0r4t5Z4BtW8eScb1 5GybJi3mlchaNApHnSQLq9137Cyu4pTo8yut0QXe3+5KzhYtZIFJT6cKy06G2JZMA7Fd 9egIp0H0X4bD9k/+5ABSaFd+PaD5a0EBgswdIb7efsn2V7cElQHkHSKWAH0DQ78hXYda MC62vGDwdU439cD0XXN8m/PvguwxNjJVDOBQ8yBBiEPXdiaThbhvaFNWhSABr8P4aJlW cVGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776873906; x=1777478706; 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=dbIScAHLkzfolps6mpjGZEZ/01fVfgMv8ysDQ0vf3Jk=; b=M31gcInPkmcn7br4QMQV0i9ACEtv1ArgPKw5P2eDFVEV5ZMRZbgiFQMsJezBZzPQK/ Mwwg9h/7V1d0mq0eMBFw6C4qTOA7hab2yt0pq0haYPMp/b6B+jNeCO51mB9D+QtuQvFn YOdc/5F2Z2ZlX4MsUWKXvvC0nA6ImL6JrZrHpFaV/SsDbu/HkSYdXf8x7GtFjBfOlx8L zVdqG9DsqCOS9LNEWaoHTfXp47qsOSiu01cB6RC8B8T5FixmjYGozvRud1tYsNdF54DT 8PIVvyDZ6Q1yVYmth5uQHRKyzZ/ufaQrOQ2uum/2nJGGe3Rc61h6i5gmtqEMsDmbZHSX 7JoQ== X-Forwarded-Encrypted: i=1; AFNElJ946bFGxfqtxEazx/ytiwdm6GlaTUw+rKTbpuU8sbKvXouilkVOVg+V8qxaWtaB4JC5WCaub6Q=@vger.kernel.org X-Gm-Message-State: AOJu0YzKdQc0ajuaxqIbV5Jpf0V4DtmUW+THHRo5GsUtW97dsZGoHIIP 5m1Wzdc/oFThREyZ+jAhg81Cug/+2zhaPS6NCgO3l3hRwXICoWDIVcCe X-Gm-Gg: AeBDiet2QRokoSi5XQ1shoW+Yg5hFb2RW5ZBFrLqQIsHvh6pAh0BACQsQeikQrDaUN+ xsTLyaPfm+kg9FQqqRmaaBtzFlxCsxbc1l5Kint/8Oaf/nruILlmcU238GKsVQQilE2HbJOS6av mMt4EHPaZezRC84gI/0WFyzQheTN7MNX1skacuhixEH07qoEPDvhpMpQidC6KUwpO5t2kfoXLFd ODYgc0avPDaSHi6Ldx56xnFsP2ORz0VRZgNYmo5z/JgSeC2Sk3S7BQCXZ0rjLC260C2ecyriWjK vh+X9u/vkP4mSLAF/RfspqmXTwiU33amcSXmfQThvPp4jMZXsU7EH5Tu/4KpyCBMCOlEneBAWRj WBSn0jORrwEaamYbi2HsKQalFr6Fsqm6YVZbOkM6AoUYv+fAGSN0Mds75vPEa0U+PVkX2q7ETZv h+KR8SjqxG72OPFOxDljKBrKM0dG1k3XTa23RHgtut5HbspMf0806CPCM4tr3wRQTncGIHvlFRp /7mrKKWVYIDTd57rJSV80HW8s4XfLY= X-Received: by 2002:a05:6102:5987:b0:613:95c8:d941 with SMTP id ada2fe7eead31-616f4f6f185mr10900447137.10.1776873906029; Wed, 22 Apr 2026 09:05:06 -0700 (PDT) Received: from server0 (c-68-48-65-54.hsd1.mi.comcast.net. [68.48.65.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8b02ac462d9sm136370786d6.7.2026.04.22.09.05.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2026 09:05:05 -0700 (PDT) From: Michael Bommarito To: Samuel Mendoza-Jonas , Paul Fertser , netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-kernel@vger.kernel.org, Michael Bommarito , stable@vger.kernel.org Subject: [PATCH net 1/6] net/ncsi: validate response packet lengths against the skb Date: Wed, 22 Apr 2026 12:03:37 -0400 Message-ID: <20260422160342.1975093-2-michael.bommarito@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260422160342.1975093-1-michael.bommarito@gmail.com> References: <20260422160342.1975093-1-michael.bommarito@gmail.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ncsi_rcv_rsp() reads the common packet header before checking that the skb contains enough data for it, and ncsi_validate_rsp_pkt() trusts the response payload length before accessing the checksum field. Malformed NC-SI replies can therefore drive header and checksum reads past the received packet body. Make the dispatcher pull the common header first, then have ncsi_validate_rsp_pkt() pull the full response body before validating the packet. This keeps malformed responses on the error path instead of letting the parser walk past the skb payload. Fixes: 138635cc27c9 ("net/ncsi: NCSI response packet handler") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Michael Bommarito --- net/ncsi/ncsi-rsp.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c index fbd84bc8026a..1fe061ede26d 100644 --- a/net/ncsi/ncsi-rsp.c +++ b/net/ncsi/ncsi-rsp.c @@ -38,11 +38,18 @@ static int ncsi_validate_rsp_pkt(struct ncsi_request *nr, struct ncsi_rsp_pkt_hdr *h; u32 checksum; __be32 *pchecksum; + unsigned int len; /* Check NCSI packet header. We don't need validate * the packet type, which should have been checked * before calling this function. */ + len = skb_network_offset(nr->rsp) + sizeof(*h) + ALIGN(payload, 4); + if (!pskb_may_pull(nr->rsp, len)) { + netdev_dbg(nr->ndp->ndev.dev, "NCSI: packet too short\n"); + return -EINVAL; + } + h = (struct ncsi_rsp_pkt_hdr *)skb_network_header(nr->rsp); if (h->common.revision != NCSI_PKT_REVISION) { @@ -1182,6 +1189,11 @@ int ncsi_rcv_rsp(struct sk_buff *skb, struct net_device *dev, } /* Check if it is AEN packet */ + if (!pskb_may_pull(skb, skb_network_offset(skb) + sizeof(*hdr))) { + ret = -EINVAL; + goto err_free_skb; + } + hdr = (struct ncsi_pkt_hdr *)skb_network_header(skb); if (hdr->type == NCSI_PKT_AEN) return ncsi_aen_handler(ndp, skb); -- 2.53.0