From nobody Sat Apr 12 01:25:41 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=1615800669; cv=none; d=zohomail.com; s=zohoarc; b=NtqRm7LeqV0DrGkTOWJX/a9LuPKSptSOYMOCdwo5xofgxepwWTFtOqCIp1QMJCmzU/aVXCly0MKft5MNgfs8Nz757wDu7AAIKA83E4EBPdlUhyb8iAcoX6ad9fk13WXoLL9ibrQx5ITLfHZgRnCXeuyJJhcx6FA4uKWIxktkFxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615800669; 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=Da8utT56JvLvicbWmGO2VftTBd8X0cgM9z+/I38HVq4=; b=dxdwM0V1RvWaoXe6yDJPi+EazKkJIZSItePL0Cf4ptQwDZpvRKorMN+DA9kvrACuTWTgp+r3Rwovk4FlMdGF0Uwcjux3bbXeM+p2kGJCPhGzcTC9BeYWDdUT3dxVNp9rPHiCFGrGa4j6iM4dD7gtaReSPHmvWuzkZH1YfNqTCag= 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 1615800669189694.9055907748597; Mon, 15 Mar 2021 02:31:09 -0700 (PDT) Received: from localhost ([::1]:43758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLjZ6-00023P-3r for importer@patchew.org; Mon, 15 Mar 2021 05:31:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLjKC-0000C7-Bd for qemu-devel@nongnu.org; Mon, 15 Mar 2021 05:15:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:27387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lLjK9-0008AO-QZ for qemu-devel@nongnu.org; Mon, 15 Mar 2021 05:15:44 -0400 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-384-d_5Mvi-tOXurYTVzPPfleQ-1; Mon, 15 Mar 2021 05:15:37 -0400 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 01D4580006E; Mon, 15 Mar 2021 09:15:36 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-13-105.pek2.redhat.com [10.72.13.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4AE9100164C; Mon, 15 Mar 2021 09:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615799741; 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=Da8utT56JvLvicbWmGO2VftTBd8X0cgM9z+/I38HVq4=; b=N4w59xmbpazFF6Hr9vqkEbu0KgnLijST+WIzzvv9WnLbwOya7Pk6hOdLg7g0f4WdWCopCT 3kT7CQBsFaGLwx4QnwXPxMqCHv7+pSUv70yKg8UReiBD433zfbCcjOGIJJZWPlmLJabfPS gN1iv0O+NVRYrM6KYsrKEXaGk51JPVU= X-MC-Unique: d_5Mvi-tOXurYTVzPPfleQ-1 From: Jason Wang To: peter.maydell@linaro.org Subject: [PULL V2 14/20] lan9118: switch to use qemu_receive_packet() for loopback Date: Mon, 15 Mar 2021 17:14:27 +0800 Message-Id: <1615799673-31549-15-git-send-email-jasowang@redhat.com> In-Reply-To: <1615799673-31549-1-git-send-email-jasowang@redhat.com> References: <1615799673-31549-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=63.128.21.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Jason Wang --- hw/net/lan9118.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index abc7962..6aff424 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -680,7 +680,7 @@ static void do_tx_packet(lan9118_state *s) /* FIXME: Honor TX disable, and allow queueing of packets. */ if (s->phy_control & 0x4000) { /* This assumes the receive routine doesn't touch the VLANClient. = */ - lan9118_receive(qemu_get_queue(s->nic), s->txp->data, s->txp->len); + qemu_receive_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->= len); } else { qemu_send_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->len= ); } --=20 2.7.4