From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03AE41AC448; Mon, 14 Oct 2024 15:13:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728918811; cv=none; b=Go+DGIOll1MiktujzSfYVN8yqcSrAgGU3O77z8rTDYNIHEW9aU1sz7x3cYJ+ngmst7/gTEiMThjKNDQNi+SuCiRNX01PWikY9GQY5nmplHPbpJ2FYJ3ULnrqIceq66EbDcvBjn4Fk9as3RHPQH5XmXOiB+M3q84+SjpbNuEVtrc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728918811; c=relaxed/simple; bh=n/pd5i6sGWZOCMSS0AdJklEsCtHR5VGwiws2Y5Ov8TA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JBAaQNVU7hiXR8NYFdwIob4tLn20pkAOGahlEa6dgRErOacdTw3PhjE895rWMQEMZHMHYD+aSub0H75u6BUlHy6AqXO0T3Bbj7DdItkOcFKlezcnEt+GluvywOIe+pI0Jg+wBi+FgfK7vgvXdsRlqkdjKqQ/zDChJC+r5mnafvc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zkoi33rI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zkoi33rI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B4ACC4CEC3; Mon, 14 Oct 2024 15:13:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728918810; bh=n/pd5i6sGWZOCMSS0AdJklEsCtHR5VGwiws2Y5Ov8TA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zkoi33rIIGevIRxkqTqj3R40ElMKpXvozeVZxTs16jJbJcoQUlayS2GVGR6ZD4U/P 7lymuCCGg7aaqy8/KbYxmhbxdxBmVnGM6eId8x37AJL79gzvIHBuDIrWIaLSvgES8i +sHxQt3oA6HWmRKaD+DoYQHa9QEbhvvAr2nuZwFc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Willem de Bruijn , David Ahern , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 398/798] net: add more sanity checks to qdisc_pkt_len_init() Date: Mon, 14 Oct 2024 16:15:52 +0200 Message-ID: <20241014141233.582369242@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit ab9a9a9e9647392a19e7a885b08000e89c86b535 ] One path takes care of SKB_GSO_DODGY, assuming skb->len is bigger than hdr_len. virtio_net_hdr_to_skb() does not fully dissect TCP headers, it only make sure it is at least 20 bytes. It is possible for an user to provide a malicious 'GSO' packet, total length of 80 bytes. - 20 bytes of IPv4 header - 60 bytes TCP header - a small gso_size like 8 virtio_net_hdr_to_skb() would declare this packet as a normal GSO packet, because it would see 40 bytes of payload, bigger than gso_size. We need to make detect this case to not underflow qdisc_skb_cb(skb)->pkt_len. Fixes: 1def9238d4aa ("net_sched: more precise pkt_len computation") Signed-off-by: Eric Dumazet Reviewed-by: Willem de Bruijn Reviewed-by: David Ahern Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/core/dev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index d14b9484e2bc1..9a6c1603ef77e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3805,10 +3805,14 @@ static void qdisc_pkt_len_init(struct sk_buff *skb) hdr_len += sizeof(struct udphdr); } - if (shinfo->gso_type & SKB_GSO_DODGY) - gso_segs = DIV_ROUND_UP(skb->len - hdr_len, - shinfo->gso_size); + if (unlikely(shinfo->gso_type & SKB_GSO_DODGY)) { + int payload = skb->len - hdr_len; + /* Malicious packet. */ + if (payload <= 0) + return; + gso_segs = DIV_ROUND_UP(payload, shinfo->gso_size); + } qdisc_skb_cb(skb)->pkt_len += (gso_segs - 1) * hdr_len; } } -- 2.43.0