From nobody Sun Feb 8 13:45:48 2026 Delivered-To: importer@patchew.org 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; 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=1583232657; cv=none; d=zohomail.com; s=zohoarc; b=Y6VCVslc7SscURbXbo8uel9jbjeUpXY9gmOYUF+MWPbQ261ebYNQt9JmCbHPyAp3PMw4zTRb9BfSJ+aWr7X7tqf/VDWeyudPZOcrjBCP7n0AJvLPKMZmv9W6+Jzv+4paJ6Q2si5tAuIKmOOsEFl7IkuQMhXEm0NyhF+EA4UNey8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583232657; 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=GargJgmhf+plxzeySLHxgt6hJ1Ash+sonU96oeGg5vY=; b=SGqBoBDGfnAIjft1yxe2+d7IESCK26y22qQ2lmA0bqGMqpbQwGkjhWuzLFBqmDguNhQAEO3QwyGVlC0ppoXX2Kt8ENkE1EEE+M7eOw6j0OnIli2dgFMODAXqURby3ursJFlNFwLGb02DD5Cy3i6s7zKz8z5G881B/k1S30uqb+w= 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 1583232657466881.1790286625496; Tue, 3 Mar 2020 02:50:57 -0800 (PST) Received: from localhost ([::1]:45310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j958Z-0005gq-Ud for importer@patchew.org; Tue, 03 Mar 2020 05:50:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59202) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j957d-0004Eo-5r for qemu-devel@nongnu.org; Tue, 03 Mar 2020 05:49:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j957b-0004FN-TD for qemu-devel@nongnu.org; Tue, 03 Mar 2020 05:49:57 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:44532 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j957b-0004FE-PR for qemu-devel@nongnu.org; Tue, 03 Mar 2020 05:49:55 -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-382-aB_pQGg7OV-AJYWHKUB_dQ-1; Tue, 03 Mar 2020 05:49:53 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1203C801E6C; Tue, 3 Mar 2020 10:49:52 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-177.sin2.redhat.com [10.67.116.177]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F9485C1D6; Tue, 3 Mar 2020 10:49:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583232595; 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=GargJgmhf+plxzeySLHxgt6hJ1Ash+sonU96oeGg5vY=; b=VysxrQl7y53Z7MOx1cJwhipjGYQJP9+owzTi2KJctDuOtUAtSGom7pWoAID9PhdlBUuYFI sdotYpUp1x5YBQMy+TOvAC+RO9OkSklqQ0FHk07VB52GBrv2mfdD4xrbfmBBgJvDRECD0j Dyimiv1Zszt09GX9wmeZI3sYDTcv6Uw= X-MC-Unique: aB_pQGg7OV-AJYWHKUB_dQ-1 From: P J P To: Jason Wang Subject: [PATCH v3 1/2] net: tulip: check frame size and r/w data length Date: Tue, 3 Mar 2020 16:17:23 +0530 Message-Id: <20200303104724.233375-2-ppandit@redhat.com> In-Reply-To: <20200303104724.233375-1-ppandit@redhat.com> References: <20200303104724.233375-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Li Qiang , Sven Schnelle , Qemu Developers , Ziming Zhang , 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-Type: text/plain; charset="utf-8" From: Prasad J Pandit Tulip network driver while copying tx/rx buffers does not check frame size against r/w data length. This may lead to OOB buffer access. Add check to avoid it. Limit iterations over descriptors to avoid potential infinite loop issue in tulip_xmit_list_update. Reported-by: Li Qiang Reported-by: Ziming Zhang Reported-by: Jason Wang Signed-off-by: Prasad J Pandit --- hw/net/tulip.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) Update v3: return a value from tulip_copy_tx_buffers() and avoid infinite l= oop -> https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg06275.html diff --git a/hw/net/tulip.c b/hw/net/tulip.c index cfac2719d3..fbe40095da 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -170,6 +170,10 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct = tulip_descriptor *desc) } else { len =3D s->rx_frame_len; } + + if (s->rx_frame_len + len >=3D sizeof(s->rx_frame)) { + return; + } pci_dma_write(&s->dev, desc->buf_addr1, s->rx_frame + (s->rx_frame_size - s->rx_frame_len), len); s->rx_frame_len -=3D len; @@ -181,6 +185,10 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct = tulip_descriptor *desc) } else { len =3D s->rx_frame_len; } + + if (s->rx_frame_len + len >=3D sizeof(s->rx_frame)) { + return; + } pci_dma_write(&s->dev, desc->buf_addr2, s->rx_frame + (s->rx_frame_size - s->rx_frame_len), len); s->rx_frame_len -=3D len; @@ -227,7 +235,8 @@ static ssize_t tulip_receive(TULIPState *s, const uint8= _t *buf, size_t size) =20 trace_tulip_receive(buf, size); =20 - if (size < 14 || size > 2048 || s->rx_frame_len || tulip_rx_stopped(s)= ) { + if (size < 14 || size > sizeof(s->rx_frame) - 4 + || s->rx_frame_len || tulip_rx_stopped(s)) { return 0; } =20 @@ -275,7 +284,6 @@ static ssize_t tulip_receive_nc(NetClientState *nc, return tulip_receive(qemu_get_nic_opaque(nc), buf, size); } =20 - static NetClientInfo net_tulip_info =3D { .type =3D NET_CLIENT_DRIVER_NIC, .size =3D sizeof(NICState), @@ -558,7 +566,7 @@ static void tulip_tx(TULIPState *s, struct tulip_descri= ptor *desc) if ((s->csr[6] >> CSR6_OM_SHIFT) & CSR6_OM_MASK) { /* Internal or external Loopback */ tulip_receive(s, s->tx_frame, s->tx_frame_len); - } else { + } else if (s->tx_frame_len <=3D sizeof(s->tx_frame)) { qemu_send_packet(qemu_get_queue(s->nic), s->tx_frame, s->tx_frame_len); } @@ -570,23 +578,31 @@ static void tulip_tx(TULIPState *s, struct tulip_desc= riptor *desc) } } =20 -static void tulip_copy_tx_buffers(TULIPState *s, struct tulip_descriptor *= desc) +static int tulip_copy_tx_buffers(TULIPState *s, struct tulip_descriptor *d= esc) { int len1 =3D (desc->control >> TDES1_BUF1_SIZE_SHIFT) & TDES1_BUF1_SIZ= E_MASK; int len2 =3D (desc->control >> TDES1_BUF2_SIZE_SHIFT) & TDES1_BUF2_SIZ= E_MASK; =20 + if (s->tx_frame_len + len1 >=3D sizeof(s->tx_frame)) { + return -1; + } if (len1) { pci_dma_read(&s->dev, desc->buf_addr1, s->tx_frame + s->tx_frame_len, len1); s->tx_frame_len +=3D len1; } =20 + if (s->tx_frame_len + len2 >=3D sizeof(s->tx_frame)) { + return -1; + } if (len2) { pci_dma_read(&s->dev, desc->buf_addr2, s->tx_frame + s->tx_frame_len, len2); s->tx_frame_len +=3D len2; } desc->status =3D (len1 + len2) ? 0 : 0x7fffffff; + + return 0; } =20 static void tulip_setup_filter_addr(TULIPState *s, uint8_t *buf, int n) @@ -651,13 +667,15 @@ static uint32_t tulip_ts(TULIPState *s) =20 static void tulip_xmit_list_update(TULIPState *s) { +#define TULIP_DESC_MAX 128 + uint8_t i =3D 0; struct tulip_descriptor desc; =20 if (tulip_ts(s) !=3D CSR5_TS_SUSPENDED) { return; } =20 - for (;;) { + for (i =3D 0; i < TULIP_DESC_MAX; i++) { tulip_desc_read(s, s->current_tx_desc, &desc); tulip_dump_tx_descriptor(s, &desc); =20 @@ -675,10 +693,10 @@ static void tulip_xmit_list_update(TULIPState *s) s->tx_frame_len =3D 0; } =20 - tulip_copy_tx_buffers(s, &desc); - - if (desc.control & TDES1_LS) { - tulip_tx(s, &desc); + if (!tulip_copy_tx_buffers(s, &desc)) { + if (desc.control & TDES1_LS) { + tulip_tx(s, &desc); + } } } tulip_desc_write(s, s->current_tx_desc, &desc); --=20 2.24.1 From nobody Sun Feb 8 13:45:48 2026 Delivered-To: importer@patchew.org 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; 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=1583232659; cv=none; d=zohomail.com; s=zohoarc; b=QEREjYlKRuFFS6+lRrXM82eTUz0q3CE9qxXJQ9tKdSIkaAG6IIdmgehk4mkJWnwpST254iw9IOmW5vjaTuRLGC46MBvbgIjgYgRTPDNCDGVwjg0pfJ7nsY/JbjfjjEZT7xEEr1WZqg5uTUeTB/2NNU3E5wqvGoko5gRVagiDk9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583232659; 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=r+TlfrilbRfne+z8GeafTqYFZOfWGvku6sWK+MuQCqo=; b=IED3vz5vRiCavM0BAPSeqKe0kIQO6JG2JVmrfvQPnSWwxzWy6/9gEcVL2PRbqogITGp+tJWMkqPcSVfWFLXHyomvbHeoqcjwk6vpcw79cGe3oi+toPYUiZyBP3R60qT6afYSB4xlUMaNpTp2fsgs225M0TJhjeZQyNeulBIyzsY= 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 1583232659117217.82711505139002; Tue, 3 Mar 2020 02:50:59 -0800 (PST) Received: from localhost ([::1]:45312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j958b-0005kv-IZ for importer@patchew.org; Tue, 03 Mar 2020 05:50:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59213) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j957g-0004Ip-D6 for qemu-devel@nongnu.org; Tue, 03 Mar 2020 05:50:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j957f-0004HT-5j for qemu-devel@nongnu.org; Tue, 03 Mar 2020 05:50:00 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37307 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j957f-0004H9-2Q for qemu-devel@nongnu.org; Tue, 03 Mar 2020 05:49:59 -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-194-Zp1wx_fSNpy8tnh7gZsb7Q-1; Tue, 03 Mar 2020 05:49:56 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9DDD5800053; Tue, 3 Mar 2020 10:49:55 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-177.sin2.redhat.com [10.67.116.177]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99A1B5C1D6; Tue, 3 Mar 2020 10:49:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583232598; 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=r+TlfrilbRfne+z8GeafTqYFZOfWGvku6sWK+MuQCqo=; b=ddk+dOW4uPA+l8q1C+B/P68evafsMw9UbwSzfDLkGOKEhPxKdKL6efibJlpj/3ytHU2gBu dl9GdYB2uul0K0W0wXlsT12bOEoWJjJRfSspB+6Fx7bQO71jRLInFHeiKnGwkyM6ENjndO bVCSsAgUvfsxrCFAXQ/GEinKgg0MzMs= X-MC-Unique: Zp1wx_fSNpy8tnh7gZsb7Q-1 From: P J P To: Jason Wang Subject: [PATCH v3 2/2] net: tulip: add .can_recieve routine Date: Tue, 3 Mar 2020 16:17:24 +0530 Message-Id: <20200303104724.233375-3-ppandit@redhat.com> In-Reply-To: <20200303104724.233375-1-ppandit@redhat.com> References: <20200303104724.233375-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Li Qiang , Sven Schnelle , Qemu Developers , Ziming Zhang , 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-Type: text/plain; charset="utf-8" From: Prasad J Pandit Define .can_receive routine to do sanity checks before receiving packet data. Signed-off-by: Prasad J Pandit --- hw/net/tulip.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) Update v3: define .can_receive routine -> https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg06275.html diff --git a/hw/net/tulip.c b/hw/net/tulip.c index fbe40095da..757f12c710 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -229,6 +229,18 @@ static bool tulip_filter_address(TULIPState *s, const = uint8_t *addr) return ret; } =20 +static int +tulip_can_receive(NetClientState *nc) +{ + TULIPState *s =3D qemu_get_nic_opaque(nc); + + if (s->rx_frame_len || tulip_rx_stopped(s)) { + return false; + } + + return true; +} + static ssize_t tulip_receive(TULIPState *s, const uint8_t *buf, size_t siz= e) { struct tulip_descriptor desc; @@ -236,7 +248,7 @@ static ssize_t tulip_receive(TULIPState *s, const uint8= _t *buf, size_t size) trace_tulip_receive(buf, size); =20 if (size < 14 || size > sizeof(s->rx_frame) - 4 - || s->rx_frame_len || tulip_rx_stopped(s)) { + || !tulip_can_receive(s->nic->ncs)) { return 0; } =20 @@ -288,6 +300,7 @@ static NetClientInfo net_tulip_info =3D { .type =3D NET_CLIENT_DRIVER_NIC, .size =3D sizeof(NICState), .receive =3D tulip_receive_nc, + .can_receive =3D tulip_can_receive, }; =20 static const char *tulip_reg_name(const hwaddr addr) --=20 2.24.1