From patchwork Sat Nov 2 17:15:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1188417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu 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 ozlabs.org (Postfix) with ESMTPS id 4755TP4YHzz9sPF for ; Sun, 3 Nov 2019 04:22:01 +1100 (AEDT) Received: from localhost ([::1]:49438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iQx67-0002z9-GD for incoming@patchwork.ozlabs.org; Sat, 02 Nov 2019 13:21:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46498) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iQx4q-0002xn-8d for qemu-devel@nongnu.org; Sat, 02 Nov 2019 13:20:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iQx4n-0005DZ-SJ for qemu-devel@nongnu.org; Sat, 02 Nov 2019 13:20:39 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:43851) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iQx4n-00050Y-H1 for qemu-devel@nongnu.org; Sat, 02 Nov 2019 13:20:37 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M2NqA-1iOCN81Muk-003spp; Sat, 02 Nov 2019 18:15:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 2/3] dp8393x: fix dp8393x_receive() Date: Sat, 2 Nov 2019 18:15:10 +0100 Message-Id: <20191102171511.31881-3-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191102171511.31881-1-laurent@vivier.eu> References: <20191102171511.31881-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:e+bdHzlMe16+ydKTAqZOKD3azelc7xkAVHIm772OZAz+NUSeZAQ hPstiR8vtFWpQrvNVxq95EtGJamWpOpf0cWLzsLY4K58YHRmuHwbhxp9pIDqU4uNClnBFiE dECf94JMy3LFtyja0jxgYIsVWghfSkDs8nobvLUB1DaJhIXqZsaTwtYc3Z9cYQWIGt0STjK uCVQxU1XbTX1lCTf7R9kQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:mRHc9lQUneE=:QgNs6PW+8droW1kmxRl4tu NBNJOPw4NZi9DHMYFXaeX3Q40g8+XU7rSaRUUTdHrG6NtQ0r1DWaidCWf8MNUiHZ8oErt4MuN 89yASYMytHVJdATNNIckn/xPmwER+qjd5yQSLhCxkD8srqYdO7u9wEdb6DgEc5O5CMkqNzgu0 dy5LnnyOrRrY1CkN0LVY36Ij2jI8ePzrISsQTM9rXvhTM7pNuWeuvT5OYvBCQHRUwj+MVdTgl lpx/RsUiLgEd4O4DqIOIGt9Zri9D+7fju5NYDdLgMKmjeRZ+JMIjNiPhM1w0MzllWAleOJNWy UBC3Y8Je6UlkkKhV4uyFe+0cbMSnAzxLIRGK2Csj/jKntyfPN3thQRUu9NRgPJPq16zkyhumW mXCK2xtC6F4LUUhrO99QnaBvTbuXaM+yKwhRLSJGi32sfYQEaE1sGayQSqeh+sRyvdze3K/QX CQTytgB/DIH4BOIz0eVqD32IA8r3scYvj97dmcSdRjVAQ25Lk+vf0nRc7fvf+QVHOow2bHfpr nrS1PTiFz8acUAqHwsokgQMMwjhJ8Z0h7xcK40lhcBrujpS/dYZXl87Uo4rHnHAbxhfeUKfbR E6ulB0nrh6SqXpFEl6gDjCqXNdSI352JTLwszq7g6w4OJIZq3c5rsFbbij/DFYjG5n9y6yDIL tVTmPWioL9frXKCVwwsgLVBy7bV2mK1z7HM3Qyxu7TQ45ukpxNUM2wdZUFTmyo+lmD4K7hNyE dLoGmd4drWWDJLWOWrIHEJDjGbmOnjzTadzm08uyTbClru+aLdBHVz4bHuQSGgjfCcwwLQJBv 0PRVnjQe+BkvKzI0DmXnmqhPW5ZKQUUB7BqbMSMeKWFDJfPQZFOYXQhIZnM93ovrn1R9ZeaNH MlO7XZi3Vs+EEj1RSEmw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 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: Jason Wang , =?utf-8?q?Herv=C3=A9_Poussineau?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" address_space_rw() access size must be multiplied by the width. This fixes DHCP for Q800 guest. Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Tested-by: Hervé Poussineau --- hw/net/dp8393x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 85d3f3788e..b8c4473f99 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -833,7 +833,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf, } else { dp8393x_put(s, width, 0, 0); /* in_use */ address_space_rw(&s->as, dp8393x_crda(s) + sizeof(uint16_t) * 6 * width, - MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, sizeof(uint16_t), 1); + MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 1); s->regs[SONIC_CRDA] = s->regs[SONIC_LLFA]; s->regs[SONIC_ISR] |= SONIC_ISR_PKTRX; s->regs[SONIC_RSC] = (s->regs[SONIC_RSC] & 0xff00) | (((s->regs[SONIC_RSC] & 0x00ff) + 1) & 0x00ff);