From nobody Sun May 5 14:34:01 2024 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=1584966270; cv=none; d=zohomail.com; s=zohoarc; b=feX1dAiLT9NE8iQr7vhadpQ5Wj1dWsd1gWbVy8AI78pXRY7LaMpb6NJkb5ct+KItyTF70yelv6nf4vkw4qtr7SRD3VzusS/33rTAJ7fPoP30jA4+9NlV7i4isFWk1xx2bhtfIWwLmwA0SsPhBMcpu5C3ed0MzsakPBhQw8uq32E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584966270; 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=AwME8ofdMlNyZiZXbkS1lNMvS2VzRBwAxzDX3MKKtIA=; b=LJTXII8/A5HYeDx7LpivCnPwDAM8X6I6kqWK6z15cEMOcHG4yHFq1c5MRluyQ5C8oDRL5/HJIhBwm0EksIhjPRrLXuffe2wnaJjXHdxWb6IRQpTLma8U6/nGY606pVRy+Kb1IbI+gOfB9dIgc40S2TXu0ZAT4im8HMOTlxIsXOc= 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 1584966270482657.9472130444599; Mon, 23 Mar 2020 05:24:30 -0700 (PDT) Received: from localhost ([::1]:33084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGM85-0006wL-4D for importer@patchew.org; Mon, 23 Mar 2020 08:24:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49388) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGM77-0005cd-Dn for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:23:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGM75-00063o-Qv for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:23:29 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:37046) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGM75-00062v-NE for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:23:27 -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-417-e9iS14SqMrK_0SWriufmYg-1; Mon, 23 Mar 2020 08:23:25 -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 3DDD91084430; Mon, 23 Mar 2020 12:23:24 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-176.phx2.redhat.com [10.3.112.176]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 745CC10016EB; Mon, 23 Mar 2020 12:23:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584966207; 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=AwME8ofdMlNyZiZXbkS1lNMvS2VzRBwAxzDX3MKKtIA=; b=JE+an/oBTZxKzcDlX5z4PQE1GkzD9wzc4YHNt0eJX1tkbLgv34rY2e4YA47TVOO6VdASfb BN7FpF+0fab/7PcbvjaMuFawgfXCyOnEHFrSSfcpTUp6ovJHHDPNyn3nfaab4ljNxfL0U4 T+i2E8p60jjZihk6ieU8bJsWlQPloek= X-MC-Unique: e9iS14SqMrK_0SWriufmYg-1 From: P J P To: Jason Wang Subject: [PATCH v6 1/2] net: tulip: check frame size and r/w data length Date: Mon, 23 Mar 2020 17:50:59 +0530 Message-Id: <20200323122100.893417-2-ppandit@redhat.com> In-Reply-To: <20200323122100.893417-1-ppandit@redhat.com> References: <20200323122100.893417-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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] [fuzzy] X-Received-From: 216.205.24.74 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: Prasad J Pandit , Stefan Hajnoczi , Sven Schnelle , Qemu Developers , Li Qiang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ziming Zhang 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 Tested-by: Li Qiang --- 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.25.1 From nobody Sun May 5 14:34:01 2024 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=1584966339; cv=none; d=zohomail.com; s=zohoarc; b=I7KmQZLEeeBf9E0wi9NiWMMGATrlhcKDTAB5gqeo/AxyXVr9J5FqGiXpg+rjtS8tDxnpAg3UnKXPTv+HTYJ00VBj5+KnH9nr/ejvwGHGHjwYGSmWR7wIq4ebLo6drWPYZMO8oF3orYp7NPMKYQhUHLP2lVPMe8CN5mVNj0gxQTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584966339; 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=EFRe3jiDSEV3wwiVm0jYoyJtEG5U0W+CR4coHC6YYZU=; b=fJ9uBDPklNc7NG0NKS3Fp2t7FHXk6oMlYwiX5vFaADHiJuVVAa2EFDeLjTCptX95UM6JOnlVXgCJ9JwVdtCrcSZ791YA7F7JO4PXZRGnsjvutjLbgzTUnK27Iqyb7dNehOJThh0fQZTrAfOLdkrdUTSrLLSKPgV8HqXJx04lHHk= 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 158496633930229.833662160931567; Mon, 23 Mar 2020 05:25:39 -0700 (PDT) Received: from localhost ([::1]:33104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGM9C-0000RD-0c for importer@patchew.org; Mon, 23 Mar 2020 08:25:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49402) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGM7J-0005r0-7h for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:23:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGM7H-00069k-HB for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:23:41 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:22819) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGM7H-00069K-Ay for qemu-devel@nongnu.org; Mon, 23 Mar 2020 08:23:39 -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-412-GbubzWBZNvKnmCJbqpOUXQ-1; Mon, 23 Mar 2020 08:23:36 -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 636F11005516; Mon, 23 Mar 2020 12:23:35 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-176.phx2.redhat.com [10.3.112.176]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B94201001920; Mon, 23 Mar 2020 12:23:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584966219; 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=EFRe3jiDSEV3wwiVm0jYoyJtEG5U0W+CR4coHC6YYZU=; b=dlwODxvEmAneS7GJOdB/+OOrhlfXue9FBxEMwIyDigYlI3eBoni+G2NWhWo/ekWpiDdayd ovRgyWgnwiTEUjJOs+VnITw/a6tv34KZkOt4wqe2hs0/KbezyBfTZFs6A00FzpQ1ZftG9D a7IK4rukUCe9Sn8j7EHy3p/y8wfbY6s= X-MC-Unique: GbubzWBZNvKnmCJbqpOUXQ-1 From: P J P To: Jason Wang Subject: [PATCH v6 2/2] net: tulip: add .can_receive routine Date: Mon, 23 Mar 2020 17:51:00 +0530 Message-Id: <20200323122100.893417-3-ppandit@redhat.com> In-Reply-To: <20200323122100.893417-1-ppandit@redhat.com> References: <20200323122100.893417-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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: 63.128.21.74 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: Prasad J Pandit , Stefan Hajnoczi , Sven Schnelle , Qemu Developers , Li Qiang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ziming Zhang 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. And call qemu_flush_queued_packets to flush queued packets once they are read in tulip_receive(). Suggested-by: Jason Wang Signed-off-by: Prasad J Pandit --- hw/net/tulip.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) Update v6: merge earlier patch 2 & 3 into one -> https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg06868.html diff --git a/hw/net/tulip.c b/hw/net/tulip.c index fbe40095da..8d8c9519e7 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 @@ -275,6 +287,8 @@ static ssize_t tulip_receive(TULIPState *s, const uint8= _t *buf, size_t size) tulip_desc_write(s, s->current_rx_desc, &desc); tulip_next_rx_descriptor(s, &desc); } while (s->rx_frame_len); + + qemu_flush_queued_packets(qemu_get_queue(s->nic)); return size; } =20 @@ -288,6 +302,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.25.1