From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MISSING_HEADERS, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27BE5C433DB for ; Fri, 26 Feb 2021 07:08:30 +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 95A5764ED3 for ; Fri, 26 Feb 2021 07:08:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95A5764ED3 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFXEi-00058W-Fo for qemu-devel@archiver.kernel.org; Fri, 26 Feb 2021 02:08:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFXBh-0002VO-9Z for qemu-devel@nongnu.org; Fri, 26 Feb 2021 02:05:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22956) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lFXBc-0003Ep-Nn for qemu-devel@nongnu.org; Fri, 26 Feb 2021 02:05:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614323115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: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=dGLwpkMnzvZ/rthNYGUaM9dbomLjZ9TtipvgvsecDcY=; b=c/xwAwR7qHpMh1ma+rN9BsKrqps5e0j+dVRjBJu5NrK86WHVgyLp8oy02mq0ZmEtbyU+/q y1DEkDPo0o/jOh2cGv8HezfNmQBaYhBFQ8IyfQYj3OLHSeBZkmRFoyM0AnkP08rKBddJA5 tE89gSJkIpYUMi2yEGKPwVQNIHjOfBc= 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-444-xOQSDe_BOcCqzbvwgbOkog-1; Fri, 26 Feb 2021 02:05:11 -0500 X-MC-Unique: xOQSDe_BOcCqzbvwgbOkog-1 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 A288B185A0D9; Fri, 26 Feb 2021 07:05:09 +0000 (UTC) Received: from wangxiaodeMacBook-Air.local (ovpn-12-208.pek2.redhat.com [10.72.12.208]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67BE05C27C; Fri, 26 Feb 2021 07:05:07 +0000 (UTC) Subject: Re: [PATCH] e1000: fail early for evil descriptor References: <20210224054528.491866-1-jasowang@redhat.com> From: Jason Wang Message-ID: <3f0bccce-3cae-e0d6-6268-7616206db30d@redhat.com> Date: Fri, 26 Feb 2021 15:05:06 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210224054528.491866-1-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MISSING_HEADERS=1.021, NICE_REPLY_A=-0.435, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Alexander Bulekov , Cheolwoo Myung , Ruhr-University Bochum , qemu-devel@nongnu.org, Prasad J Pandit Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2021/2/24 1:45 下午, Jason Wang wrote: > During procss_tx_desc(), driver can try to chain data descriptor with > legacy descriptor, when will lead underflow for the following > calculation in process_tx_desc() for bytes: > > if (tp->size + bytes > msh) > bytes = msh - tp->size; > > This will lead a infinite loop. So check and fail early if tp->size if > greater or equal to msh. > > Reported-by: Alexander Bulekov > Reported-by: Cheolwoo Myung > Reported-by: Ruhr-University Bochum > Cc: Prasad J Pandit > Signed-off-by: Jason Wang > --- > hw/net/e1000.c | 4 ++++ > 1 file changed, 4 insertions(+) Applied. Thanks > > diff --git a/hw/net/e1000.c b/hw/net/e1000.c > index d8da2f6528..4345d863e6 100644 > --- a/hw/net/e1000.c > +++ b/hw/net/e1000.c > @@ -670,6 +670,9 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) > msh = tp->tso_props.hdr_len + tp->tso_props.mss; > do { > bytes = split_size; > + if (tp->size >= msh) { > + goto eop; > + } > if (tp->size + bytes > msh) > bytes = msh - tp->size; > > @@ -695,6 +698,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) > tp->size += split_size; > } > > +eop: > if (!(txd_lower & E1000_TXD_CMD_EOP)) > return; > if (!(tp->cptse && tp->size < tp->tso_props.hdr_len)) {