From patchwork Wed Nov 11 13:11:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 322925 Delivered-To: patch@linaro.org Received: by 2002:a17:906:d156:0:0:0:0 with SMTP id br22csp662775ejb; Wed, 11 Nov 2020 05:32:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvndUBTCdre5EGmW1Qh0vL5QnAztMANK5W7JDNEeIpK97YylexoxvaSiES3BxgcAr5lh3z X-Received: by 2002:a25:493:: with SMTP id 141mr17815805ybe.104.1605101532361; Wed, 11 Nov 2020 05:32:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605101532; cv=none; d=google.com; s=arc-20160816; b=Gd+fGmsNrFThLTG1QH5WBcIr7F+7POG9r4gzhBeXHjMC+tFLQRJJsG5mjJZrfBwNiO eay+4jC9ghuwriHAl8wwWaV0es3qLAnrNyJhjHUVEuLe0ND9Yv9wR3mi0mPgbRG0lDir 9RFA2VMTC65ynzMuq4G2t7e9t3GrpZrlPHxN0s1svyX/5F5yNs8AzW8V+fYzC/E7TW9E dRGHANucy0jqswBZF06ARjUCKGLgGvcsfMQeJmBlpoqk2IHNSLVT/JEStb3orgcbewrb drk+LLKRg61taTpkkhlauf3M26Ssc4FThPI0Oe5f+xoJYTLmIZ8sqviROE2Sjg6hGql/ XXOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=bhHctUgBLKeuQGVfGwsPAFIarLfy5Zp2GRSCj1/r2pk=; b=eBFXHKjbleBOmEMOOer9uUQifAVn0nEMcjjUtQjLdyXTIaMAfjMvcUXgejzwelXohi eqGLM9U+ZUQMDhT6djRn5HlOPGCWbjRquCK2IigDBLg7xsHvyh46krU9TYklPVTk1Tly Dfu/bjoEDnept8K2g8xgEaCXrIO01Ji4cNa6kGV85Zw8TqaI0LNWghEX6NH+DiW1KPon pZVg0oKYwL54ANrvM3/nWh6gwOnUK1XAw5hKE0Eew8XW8OoCSyDSjlII9ZUKEgXNO7rU 0bokZQ0f5gxwE+6DpoeJsMu8ltcDCNOzw7hLdTjXmGXbuz+PKbaHBBEfpJweLTL1SAEb 5jUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=E9pQgFY7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q9si1781967ybc.186.2020.11.11.05.32.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Nov 2020 05:32:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=E9pQgFY7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:48288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcqEN-00018l-P3 for patch@linaro.org; Wed, 11 Nov 2020 08:32:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcpvK-0007Nn-VI for qemu-devel@nongnu.org; Wed, 11 Nov 2020 08:12:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcpvI-0002HT-Lh for qemu-devel@nongnu.org; Wed, 11 Nov 2020 08:12:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605100348; 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=bhHctUgBLKeuQGVfGwsPAFIarLfy5Zp2GRSCj1/r2pk=; b=E9pQgFY7LzHBS0EQ2+StKy8RPf1ybaANOZZMmhISuzZszNAwcEpMVP3JiEhiekqROXj76S V0ktVQ0Xjp1Y6D18p9AtcA0qbGLNDHlOqngvJOBvNEZ7K0YIfal14tSGYCRnIHvTkWxN9/ Xs8bRC+E/ZNKYVucfR3WCg+gZfi7260= 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-571-ceKP-XgkNZS74NWMK4eIjQ-1; Wed, 11 Nov 2020 08:12:25 -0500 X-MC-Unique: ceKP-XgkNZS74NWMK4eIjQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A299364083; Wed, 11 Nov 2020 13:12:24 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-61.pek2.redhat.com [10.72.12.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F7C055760; Wed, 11 Nov 2020 13:12:22 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL 17/17] hw/net/can/ctucan_core: Use stl_le_p to write to tx_buffers Date: Wed, 11 Nov 2020 21:11:41 +0800 Message-Id: <1605100301-11317-18-git-send-email-jasowang@redhat.com> In-Reply-To: <1605100301-11317-1-git-send-email-jasowang@redhat.com> References: <1605100301-11317-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/11 01:49:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, 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: Jason Wang , Pavel Pisa Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Instead of casting an address within a uint8_t array to a uint32_t*, use stl_le_p(). This handles possibly misaligned addresses which would otherwise crash on some hosts. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pavel Pisa Tested-by: Pavel Pisa Signed-off-by: Jason Wang --- hw/net/can/ctucan_core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/hw/net/can/ctucan_core.c b/hw/net/can/ctucan_core.c index f49c762..d171c37 100644 --- a/hw/net/can/ctucan_core.c +++ b/hw/net/can/ctucan_core.c @@ -303,11 +303,9 @@ void ctucan_mem_write(CtuCanCoreState *s, hwaddr addr, uint64_t val, addr -= CTU_CAN_FD_TXTB1_DATA_1; buff_num = addr / CTUCAN_CORE_TXBUFF_SPAN; addr %= CTUCAN_CORE_TXBUFF_SPAN; - addr &= ~3; if ((buff_num < CTUCAN_CORE_TXBUF_NUM) && - (addr < sizeof(s->tx_buffer[buff_num].data))) { - uint32_t *bufp = (uint32_t *)(s->tx_buffer[buff_num].data + addr); - *bufp = cpu_to_le32(val); + ((addr + size) <= sizeof(s->tx_buffer[buff_num].data))) { + stn_le_p(s->tx_buffer[buff_num].data + addr, size, val); } } else { switch (addr & ~3) {