From nobody Mon Feb 9 21:40:22 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1594729832; cv=none; d=zohomail.com; s=zohoarc; b=LUcXE1hh5PhRrJTKtlDgZ62//XKWYV0DME22/BGwaZPDjsCG/yD4LXxclWWsARWkbY0m3GlFM16ilVWBea6ae51z21BuAKW39YbdeLyUWpknmTabOIAX0ys/tBaGv072U5vLyimvYTykCmTcXN+VYDPWvEAZj0g6W8mwtVOwPT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594729832; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TiJmP84fYCWtcrwCfmPiWA9raLRLkF+qrR458zJPqns=; b=emy7OjZsW7xrAuwlw5zIXpEo8kNRabFvai5oIt3dRJcBFtjSFFkkWIdb0qHg0vAKxDlbWW95n9tbfYxcxL8FT5s1mn7kQNgHIuQpWQuZLWc59bokIjc4+3k6O/Bz0npTkPCGyQp6c2hd5PaAaOcZIv4MHfQYW3ga5sbA0KZBVDw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594729832066346.511317917063; Tue, 14 Jul 2020 05:30:32 -0700 (PDT) Received: from localhost ([::1]:40358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvK4s-0000du-Px for importer@patchew.org; Tue, 14 Jul 2020 08:30:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvK2l-0008A2-9X for qemu-devel@nongnu.org; Tue, 14 Jul 2020 08:28:19 -0400 Received: from mxa2.seznam.cz ([2a02:598:2::90]:58117) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvK2j-00086H-OU for qemu-devel@nongnu.org; Tue, 14 Jul 2020 08:28:18 -0400 Received: from email.seznam.cz by email-smtpc6b.ng.seznam.cz (email-smtpc6b.ng.seznam.cz [10.23.13.165]) id 1366aa58d1d9b51916144e6c; Tue, 14 Jul 2020 14:28:16 +0200 (CEST) Received: from hathi.duckdns.org (2001:718:2:1654:e269:95ff:fec3:1c81 [2001:718:2:1654:e269:95ff:fec3:1c81]) by email-relay26.ng.seznam.cz (Seznam SMTPD 1.3.119) with ESMTP; Tue, 14 Jul 2020 14:28:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seznam.cz; s=beta; t=1594729696; bh=TiJmP84fYCWtcrwCfmPiWA9raLRLkF+qrR458zJPqns=; h=Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=L0QjY1MC7m8xzaDbnTVAlISBC0LpKkS8jpwNq5QkpZM+Z4jQ4M5znMKXykD6ziw5D EF8X0C/BcBKRIAsFfhFAmyfD6BlXKkGe0E253N/lHK/B9io4E7TrL9iXigvhBzUJVb Il96WGlAhnrrNfYzJPmxcIskjVtReVKMf+gtUwfk= From: pisa@cmp.felk.cvut.cz To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v1 2/6] hw/net/can: sja1000 ignore CAN FD frames Date: Tue, 14 Jul 2020 14:20:15 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a02:598:2::90; envelope-from=autobot.majer@seznam.cz; helo=mxa2.seznam.cz X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: Marek Vasut , Oliver Hartkopp , Jiri Novak , Stefan Hajnoczi , Deniz Eren , Markus Armbruster , Oleksij Rempel , Konrad Frederic , Jan Charvat , Jan Kiszka , Ondrej Ille , Pavel Pisa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jan Charvat Signed-off-by: Jan Charvat Signed-off-by: Pavel Pisa Reviewed-by: Vikram Garhwal --- hw/net/can/can_sja1000.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index d83c550edc..382911560c 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -323,11 +323,16 @@ static void buff2frame_bas(const uint8_t *buff, qemu_= can_frame *frame) static int frame2buff_pel(const qemu_can_frame *frame, uint8_t *buff) { int i; + int dlen =3D frame->can_dlc; =20 if (frame->can_id & QEMU_CAN_ERR_FLAG) { /* error frame, NOT support n= ow. */ return -1; } =20 + if (dlen > 8) { + return -1; + } + buff[0] =3D 0x0f & frame->can_dlc; /* DLC */ if (frame->can_id & QEMU_CAN_RTR_FLAG) { /* RTR */ buff[0] |=3D (1 << 6); @@ -338,18 +343,18 @@ static int frame2buff_pel(const qemu_can_frame *frame= , uint8_t *buff) buff[2] =3D extract32(frame->can_id, 13, 8); /* ID.20~ID.13 */ buff[3] =3D extract32(frame->can_id, 5, 8); /* ID.12~ID.05 */ buff[4] =3D extract32(frame->can_id, 0, 5) << 3; /* ID.04~ID.00,xx= x */ - for (i =3D 0; i < frame->can_dlc; i++) { + for (i =3D 0; i < dlen; i++) { buff[5 + i] =3D frame->data[i]; } - return frame->can_dlc + 5; + return dlen + 5; } else { /* SFF */ buff[1] =3D extract32(frame->can_id, 3, 8); /* ID.10~ID.03 */ buff[2] =3D extract32(frame->can_id, 0, 3) << 5; /* ID.02~ID.00,xx= xxx */ - for (i =3D 0; i < frame->can_dlc; i++) { + for (i =3D 0; i < dlen; i++) { buff[3 + i] =3D frame->data[i]; } =20 - return frame->can_dlc + 3; + return dlen + 3; } =20 return -1; @@ -358,6 +363,7 @@ static int frame2buff_pel(const qemu_can_frame *frame, = uint8_t *buff) static int frame2buff_bas(const qemu_can_frame *frame, uint8_t *buff) { int i; + int dlen =3D frame->can_dlc; =20 /* * EFF, no support for BasicMode @@ -369,17 +375,21 @@ static int frame2buff_bas(const qemu_can_frame *frame= , uint8_t *buff) return -1; } =20 + if (dlen > 8) { + return -1; + } + buff[0] =3D extract32(frame->can_id, 3, 8); /* ID.10~ID.03 */ buff[1] =3D extract32(frame->can_id, 0, 3) << 5; /* ID.02~ID.00,xxxxx = */ if (frame->can_id & QEMU_CAN_RTR_FLAG) { /* RTR */ buff[1] |=3D (1 << 4); } buff[1] |=3D frame->can_dlc & 0x0f; - for (i =3D 0; i < frame->can_dlc; i++) { + for (i =3D 0; i < dlen; i++) { buff[2 + i] =3D frame->data[i]; } =20 - return frame->can_dlc + 2; + return dlen + 2; } =20 static void can_sja_update_pel_irq(CanSJA1000State *s) @@ -764,6 +774,13 @@ ssize_t can_sja_receive(CanBusClientState *client, con= st qemu_can_frame *frames, if (frames_cnt <=3D 0) { return 0; } + if (frame->flags && QEMU_CAN_FRMF_TYPE_FD) { + if (DEBUG_FILTER) { + can_display_msg("[cansja]: ignor fd frame ", frame); + } + return 1; + } + if (DEBUG_FILTER) { can_display_msg("[cansja]: receive ", frame); } --=20 2.20.1