From nobody Fri Apr 11 20:02:09 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615530309; cv=none; d=zohomail.com; s=zohoarc; b=Pf+v6t/kS1CsX0JC8Wknb8QwolBtdTPnIUF4XRU0t3qz0COpQSaTbbcz7aQLATN+nuiY1GpYWmN1dBRDb9TV/8iPv+Udo43TzgXxXx9P7kOoCNgnB3gSy/ogG2gAGxF2kNxq4+fvbcECOdMo/sD33hiz00lpP4YKW5HqTKOqOUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615530309; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=cHDylX3VDgnAxGpHNhSOXdMfRX+mhcDAqVY6r7JPZHo=; b=U3g5nNICY9rv37V9Rc5klU5m1DoTaxtPcFDLFJ4NBn9k5kKbc5ulVdocFNxTe0lPL6I0qjnlUSerucSmr9GgmQyuNi0vDxLYyg19bz3maGOjRMCJe9ITnJS93kAPJydhCcAN2YUJUPPWe+UoOtqyXxGRYKSZhaycdW0yUZuZkjY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161553030974124.292431946115585; Thu, 11 Mar 2021 22:25:09 -0800 (PST) Received: from localhost ([::1]:43572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKbES-0003fN-GG for importer@patchew.org; Fri, 12 Mar 2021 01:25:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKb6Q-0000BA-Ce for qemu-devel@nongnu.org; Fri, 12 Mar 2021 01:16:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKb6N-0005kf-TA for qemu-devel@nongnu.org; Fri, 12 Mar 2021 01:16:50 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-593-yFEswhfvOS6EqEuctrtHXg-1; Fri, 12 Mar 2021 01:16:42 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8046E1005E6C; Fri, 12 Mar 2021 06:16:41 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-126.pek2.redhat.com [10.72.12.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D1CB1037E80; Fri, 12 Mar 2021 06:16:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615529807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=cHDylX3VDgnAxGpHNhSOXdMfRX+mhcDAqVY6r7JPZHo=; b=J3QuzWaWBwk2GsqaH88TeMmpG6WIODGC4UD1CjV38siO0MK34TuGZsO7Zdg/e284v4fc63 jUGsnVAIwUvGRK96ImiVdgubmo2brOdqyBbFNlZ8fcnVtQQTMzyeIoycMLkslBgWKbc0qI XYmqXoP9klcC7yeR+8/BAWY5ZK3lauI= X-MC-Unique: yFEswhfvOS6EqEuctrtHXg-1 From: Jason Wang To: peter.maydell@linaro.org Subject: [PULL 05/16] e1000: fail early for evil descriptor Date: Fri, 12 Mar 2021 14:16:15 +0800 Message-Id: <1615529786-30763-6-git-send-email-jasowang@redhat.com> In-Reply-To: <1615529786-30763-1-git-send-email-jasowang@redhat.com> References: <1615529786-30763-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , qemu-stable@nongnu.org, qemu-devel@nongnu.org, Prasad J Pandit Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" During procss_tx_desc(), driver can try to chain data descriptor with legacy descriptor, when will lead underflow for the following calculation in process_tx_desc() for bytes: if (tp->size + bytes > msh) bytes =3D msh - tp->size; This will lead a infinite loop. So check and fail early if tp->size if greater or equal to msh. Reported-by: Alexander Bulekov Reported-by: Cheolwoo Myung Reported-by: Ruhr-University Bochum Cc: Prasad J Pandit Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang --- hw/net/e1000.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index d8da2f6..4345d86 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -670,6 +670,9 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) msh =3D tp->tso_props.hdr_len + tp->tso_props.mss; do { bytes =3D split_size; + if (tp->size >=3D msh) { + goto eop; + } if (tp->size + bytes > msh) bytes =3D msh - tp->size; =20 @@ -695,6 +698,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) tp->size +=3D split_size; } =20 +eop: if (!(txd_lower & E1000_TXD_CMD_EOP)) return; if (!(tp->cptse && tp->size < tp->tso_props.hdr_len)) { --=20 2.7.4