From patchwork Mon Feb 17 11:38:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11386163 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F4DE139A for ; Mon, 17 Feb 2020 11:41:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 05A88206F4 for ; Mon, 17 Feb 2020 11:41:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XZHFXPI/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 05A88206F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:44012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3emT-0004KN-Vl for patchwork-qemu-devel@patchwork.kernel.org; Mon, 17 Feb 2020 06:41:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40048) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3elM-0003Uw-DI for qemu-devel@nongnu.org; Mon, 17 Feb 2020 06:40:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3elK-0005xc-HJ for qemu-devel@nongnu.org; Mon, 17 Feb 2020 06:40:32 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:30202 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 1j3elK-0005wo-2f for qemu-devel@nongnu.org; Mon, 17 Feb 2020 06:40:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581939629; 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; bh=RboALFaWCzX27DhgT8/VbBaC4QMtf4meayYQ7bJtoMo=; b=XZHFXPI/YQ2aft7x7ZEbBKwqdGVmz9lxOFhCm81F490TO6KDXr8Nt9j4qF5of13jVvghle AWdh4Wpssct9rDpGpiNeQsf68+Nyir5HybrzKmnzn4sWfpb5Kw/NjuKEC8WKzD3fXkhR7x 19pcEzsWImK3HxI+pp65+ilCrwXWTpg= 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-358-noGN4ZkHM1KBp3V8g1bUqw-1; Mon, 17 Feb 2020 06:40:20 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C2B38017CC; Mon, 17 Feb 2020 11:40:19 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.10.55]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3723D87B12; Mon, 17 Feb 2020 11:40:08 +0000 (UTC) From: P J P To: Sven Schnelle Subject: [PATCH v2] net: tulip: check frame size and r/w data length Date: Mon, 17 Feb 2020 17:08:04 +0530 Message-Id: <20200217113804.341836-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: noGN4ZkHM1KBp3V8g1bUqw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 , Jason Wang , Qemu Developers , Ziming Zhang , Prasad J Pandit Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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. Reported-by: Li Qiang Reported-by: Ziming Zhang Signed-off-by: Prasad J Pandit --- hw/net/tulip.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) Update v2: retain earlier len[12] & s->rx_frame_len checks -> https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg04160.html diff --git a/hw/net/tulip.c b/hw/net/tulip.c index cfac2719d3..ea4fd371e3 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 = s->rx_frame_len; } + + if (s->rx_frame_len + len >= 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 -= len; @@ -181,6 +185,10 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc) } else { len = s->rx_frame_len; } + + if (s->rx_frame_len + len >= 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 -= len; @@ -227,7 +235,8 @@ static ssize_t tulip_receive(TULIPState *s, const uint8_t *buf, size_t size) trace_tulip_receive(buf, size); - 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; } @@ -558,7 +567,7 @@ static void tulip_tx(TULIPState *s, struct tulip_descriptor *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 < sizeof(s->tx_frame)) { qemu_send_packet(qemu_get_queue(s->nic), s->tx_frame, s->tx_frame_len); } @@ -575,12 +584,18 @@ static void tulip_copy_tx_buffers(TULIPState *s, struct tulip_descriptor *desc) int len1 = (desc->control >> TDES1_BUF1_SIZE_SHIFT) & TDES1_BUF1_SIZE_MASK; int len2 = (desc->control >> TDES1_BUF2_SIZE_SHIFT) & TDES1_BUF2_SIZE_MASK; + if (s->tx_frame_len + len1 >= sizeof(s->tx_frame)) { + return; + } if (len1) { pci_dma_read(&s->dev, desc->buf_addr1, s->tx_frame + s->tx_frame_len, len1); s->tx_frame_len += len1; } + if (s->tx_frame_len + len2 >= sizeof(s->tx_frame)) { + return; + } if (len2) { pci_dma_read(&s->dev, desc->buf_addr2, s->tx_frame + s->tx_frame_len, len2);