From patchwork Fri Jul 10 08:54:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Matteo Cascella X-Patchwork-Id: 11656057 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 BB7DE1709 for ; Fri, 10 Jul 2020 08:57:58 +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 915BB207BC for ; Fri, 10 Jul 2020 08:57:58 +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="D/3BM+Nb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 915BB207BC 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]:49600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtoqz-0003Uz-Tr for patchwork-qemu-devel@patchwork.kernel.org; Fri, 10 Jul 2020 04:57:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtoqS-0002vN-Qz for qemu-devel@nongnu.org; Fri, 10 Jul 2020 04:57:24 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:39487 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtoqR-0000F3-C9 for qemu-devel@nongnu.org; Fri, 10 Jul 2020 04:57:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594371442; 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=6UuvXk6F+b+Tv3n3h9p2quCLU/54dxm2IrU0BRnuky0=; b=D/3BM+Nb1ESS3hw5jPxkyq5H43eiScWg30fbNwiS1rlXT6KH7z61AL/OllxZ0uYwMyrivr wN/pkrhwJ0vZRDhBZ+9v1SMpe52KzyPBoz07+ryoXgfnIdhzpIcrG9aWBq6R64Ia/KQIaI awuXMWEN4uyPJgvo7fKj7f1IiSUAayE= 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-285-0jJaHsoGMbWBjIj1jSPDjA-1; Fri, 10 Jul 2020 04:56:12 -0400 X-MC-Unique: 0jJaHsoGMbWBjIj1jSPDjA-1 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 48B781B18BDB; Fri, 10 Jul 2020 08:56:11 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.40.193.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F7E574F48; Fri, 10 Jul 2020 08:56:09 +0000 (UTC) From: Mauro Matteo Cascella To: qemu-devel@nongnu.org Subject: [PATCH] hw/net/ftgmac100: Fix integer overflow in ftgmac100_do_tx() Date: Fri, 10 Jul 2020 10:54:18 +0200 Message-Id: <20200710085417.638904-1-mcascell@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=mcascell@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 22:08:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, Mauro Matteo Cascella , andrew@aj.id.au, qemu-arm@nongnu.org, clg@kaod.org, ezrakiez@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" An integer overflow issue was reported by Mr. Ziming Zhang, CC'd here. It occurs while inserting the VLAN tag in packets whose length is less than 12 bytes, as (len-12) is passed to memmove() without proper checking. This patch is intended to fix this issue by checking the minimum Ethernet frame size during packet transmission. Reported-by: Ziming Zhang Signed-off-by: Mauro Matteo Cascella --- hw/net/ftgmac100.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 043ba61b86..bcf4d84aea 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -238,6 +238,11 @@ typedef struct { */ #define FTGMAC100_MAX_FRAME_SIZE 9220 +/* + * Min frame size + */ +#define FTGMAC100_MIN_FRAME_SIZE 64 + /* Limits depending on the type of the frame * * 9216 for Jumbo frames (+ 4 for VLAN) @@ -507,6 +512,15 @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring, } len = FTGMAC100_TXDES0_TXBUF_SIZE(bd.des0); + + /* drop small packets */ + if (bd.des0 & FTGMAC100_TXDES0_FTS && + len < FTGMAC100_MIN_FRAME_SIZE) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: frame too small: %d bytes\n", + __func__, len); + break; + } + if (frame_size + len > sizeof(s->frame)) { qemu_log_mask(LOG_GUEST_ERROR, "%s: frame too big : %d bytes\n", __func__, len);