From nobody Fri Apr 11 20:15:48 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=1615530332; cv=none; d=zohomail.com; s=zohoarc; b=FVDan6m5FSpZkj+vMxvQEki0JPTcs/pQyJ14uRiB7LuJBvrDxmev0oWxw5bJ9c3T7mjxr5bWRUAMhpOvs5TnI0RBPGA9hvVy08qDU9S0/5SfGkxXT+UtbCF1n8WML1xR+RB2u1vCDoI96hCZtIop5Tl/bjopd2BphthTmVICP1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615530332; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ew/5txxMQKVoLsaPrRnRTg8UBay6ZQd+g3eeE8dHLCA=; b=dKWKTImySTlSKRJeruD0sE8utuoZI9Bsjj68nbouTaZc+NcuoJg+FprETLqnd0zuwYj0v2HsIdGj3ty381BnVb75rPuvwQ8u0RC4JFbvYtixXsOvfWdepDc5+8hCXGCzSvWQNB61jTtlsuY5Ov7TtTQxHNfFJPZypVM4kgjJZ+g= 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 1615530332987678.055011672633; Thu, 11 Mar 2021 22:25:32 -0800 (PST) Received: from localhost ([::1]:44862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKbEp-0004Do-UV for importer@patchew.org; Fri, 12 Mar 2021 01:25:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKb6j-0000kD-Uk for qemu-devel@nongnu.org; Fri, 12 Mar 2021 01:17:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37034) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKb6i-0005zg-Aj for qemu-devel@nongnu.org; Fri, 12 Mar 2021 01:17:09 -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-195-I4iqBYYiOl-zbgnLdxsiFg-1; Fri, 12 Mar 2021 01:17:03 -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 C5F551005E6C; Fri, 12 Mar 2021 06:17:01 +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 950A3101F501; Fri, 12 Mar 2021 06:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615529827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ew/5txxMQKVoLsaPrRnRTg8UBay6ZQd+g3eeE8dHLCA=; b=JDI3Awc7z6O/l9ZckfUl0WrY+nmPNeOAN2cED7+8dBLwzfan+73CfCBwoShRVX2HpRzhHM XKzr1FhqKZqDuRyzM2T3bzERkXw+B4A/ryHjR18XU2k6ZUOffdku8N7uG30iYeEg65qsTn RvM0iJzlKw8E4gEqjOS+7g0cL+KlprQ= X-MC-Unique: I4iqBYYiOl-zbgnLdxsiFg-1 From: Jason Wang To: peter.maydell@linaro.org Subject: [PULL 13/16] pcnet: switch to use qemu_receive_packet() for loopback Date: Fri, 12 Mar 2021 14:16:23 +0800 Message-Id: <1615529786-30763-14-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> MIME-Version: 1.0 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 , Alexander Bulekov , 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) From: Alexander Bulekov This patch switches to use qemu_receive_packet() which can detect reentrancy and return early. This is intended to address CVE-2021-3416. Cc: Prasad J Pandit Cc: qemu-stable@nongnu.org Buglink: https://bugs.launchpad.net/qemu/+bug/1917085 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Jason Wang --- hw/net/pcnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index f3f18d8..dcd3fc4 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -1250,7 +1250,7 @@ txagain: if (BCR_SWSTYLE(s) =3D=3D 1) add_crc =3D !GET_FIELD(tmd.status, TMDS, NOFCS); s->looptest =3D add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_= NOCRC; - pcnet_receive(qemu_get_queue(s->nic), s->buffer, s->xmit_pos); + qemu_receive_packet(qemu_get_queue(s->nic), s->buffer, s->xmit= _pos); s->looptest =3D 0; } else { if (s->nic) { --=20 2.7.4