lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 25 Dec 2010 17:55:12 +0100 From: Marc Kleine-Budde <mkl@...gutronix.de> To: netdev@...r.kernel.org Cc: socketcan-core@...ts.berlios.de, Marc Kleine-Budde <mkl@...gutronix.de>, Wolfgang Grandegger <wg@...ndegger.com> Subject: [PATCH v2 4/9] can: sja1000: don't copy data to rx'ed RTR frames Signed-off-by: Marc Kleine-Budde <mkl@...gutronix.de> Cc: Wolfgang Grandegger <wg@...ndegger.com> Acked-by: Wolfgang Grandegger <wg@...ndegger.com> --- drivers/net/can/sja1000/sja1000.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index 0a8de01..bb4bfe3 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -346,13 +346,12 @@ static void sja1000_rx(struct net_device *dev) | (priv->read_reg(priv, REG_ID2) >> 5); } - if (fi & FI_RTR) { + cf->can_dlc = get_can_dlc(fi & 0x0F); + if (fi & FI_RTR) id |= CAN_RTR_FLAG; - } else { - cf->can_dlc = get_can_dlc(fi & 0x0F); + else for (i = 0; i < cf->can_dlc; i++) cf->data[i] = priv->read_reg(priv, dreg++); - } cf->can_id = id; -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists