can: dev: fix skb drop check

In commit a6d190f8c767 ("can: skb: drop tx skb if in listen only
mode") the priv->ctrlmode element is read even on virtual CAN
interfaces that do not create the struct can_priv at startup. This
out-of-bounds read may lead to CAN frame drops for virtual CAN
interfaces like vcan and vxcan.

This patch mainly reverts the original commit and adds a new helper
for CAN interface drivers that provide the required information in
struct can_priv.

Fixes: a6d190f8c767 ("can: skb: drop tx skb if in listen only mode")
Reported-by: Dariusz Stojaczyk <Dariusz.Stojaczyk@opensynergy.com>
Cc: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Cc: Max Staudt <max@enpas.org>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/all/20221102095431.36831-1-socketcan@hartkopp.net
Cc: stable@vger.kernel.org # 6.0.x
[mkl: patch pch_can, too]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 3a2d109a3792fdfc61fbd64ffa472669a939dde7..199cb200f2bdd246068830de3d00ceeb4cae4047 100644 (file)
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -452,7 +452,7 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)
        unsigned int mb, prio;
        u32 reg_mid, reg_mcr;
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        mb = get_tx_next_mb(priv);

diff --git a/drivers/net/can/c_can/c_can_main.c b/drivers/net/can/c_can/c_can_main.c
index d6605dbb7737bb7227301e8760d00a86fd78c3a7..c63f7fc1e69177b7a9f4b5de890d59d942a96803 100644 (file)
--- a/drivers/net/can/c_can/c_can_main.c
+++ b/drivers/net/can/c_can/c_can_main.c
@@ -457,7 +457,7 @@ static netdev_tx_t c_can_start_xmit(struct sk_buff *skb,
        struct c_can_tx_ring *tx_ring = &priv->tx;
        u32 idx, obj, cmd = IF_COMM_TX;
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        if (c_can_tx_busy(priv, tx_ring))

diff --git a/drivers/net/can/can327.c b/drivers/net/can/can327.c
index 0aa1af31d0fe4990a699e8cc37a8f2b13e3d0483..094197780776197771133b35ff74350a2586a476 100644 (file)
--- a/drivers/net/can/can327.c
+++ b/drivers/net/can/can327.c
@@ -813,7 +813,7 @@ static netdev_tx_t can327_netdev_start_xmit(struct sk_buff *skb,
        struct can327 *elm = netdev_priv(dev);
        struct can_frame *frame = (struct can_frame *)skb->data;
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        /* We shouldn't get here after a hardware fault:

diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c
index 0b9dfc76e769cf8338b32b299099fc7cc160b8c7..30909f3aab576fb8eefb46b83f0aeca2fa7ffda1 100644 (file)
--- a/drivers/net/can/cc770/cc770.c
+++ b/drivers/net/can/cc770/cc770.c
@@ -429,7 +429,7 @@ static netdev_tx_t cc770_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct cc770_priv *priv = netdev_priv(dev);
        unsigned int mo = obj2msgobj(CC770_OBJ_TX);
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        netif_stop_queue(dev);

diff --git a/drivers/net/can/ctucanfd/ctucanfd_base.c b/drivers/net/can/ctucanfd/ctucanfd_base.c
index b8da15ea6ad9a1b050b71cb52ebfe00c2890fbd6..64c349fd46007fe915f3ce51b4931cf61734260b 100644 (file)
--- a/drivers/net/can/ctucanfd/ctucanfd_base.c
+++ b/drivers/net/can/ctucanfd/ctucanfd_base.c
@@ -600,7 +600,7 @@ static netdev_tx_t ctucan_start_xmit(struct sk_buff *skb, struct net_device *nde
        bool ok;
        unsigned long flags;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        if (unlikely(!CTU_CAN_FD_TXTNF(priv))) {

diff --git a/drivers/net/can/dev/skb.c b/drivers/net/can/dev/skb.c
index 791a51e2f5d6414678076f2c204d4b4e903c00b5..241ec636e91fd09f5006b694a3f32fec46662af6 100644 (file)
--- a/drivers/net/can/dev/skb.c
+++ b/drivers/net/can/dev/skb.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/can/dev.h>
-#include <linux/can/netlink.h>
 #include <linux/module.h>
 
 #define MOD_DESC "CAN device driver interface"
@@ -337,8 +336,6 @@ static bool can_skb_headroom_valid(struct net_device *dev, struct sk_buff *skb)
 /* Drop a given socketbuffer if it does not contain a valid CAN frame. */
 bool can_dropped_invalid_skb(struct net_device *dev, struct sk_buff *skb)
 {
-       struct can_priv *priv = netdev_priv(dev);
-
        switch (ntohs(skb->protocol)) {
        case ETH_P_CAN:
                if (!can_is_can_skb(skb))
@@ -359,13 +356,8 @@ bool can_dropped_invalid_skb(struct net_device *dev, struct sk_buff *skb)
                goto inval_skb;
        }
 
-       if (!can_skb_headroom_valid(dev, skb)) {
+       if (!can_skb_headroom_valid(dev, skb))
                goto inval_skb;
-       } else if (priv->ctrlmode & CAN_CTRLMODE_LISTENONLY) {
-               netdev_info_once(dev,
-                                "interface in listen only mode, dropping skb\n");
-               goto inval_skb;
-       }
 
        return false;
 

diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c
index 5ee38e586fd8026d88257a8a24005e85b5ef285f..9bdadd716f4e0514942545e3a90a2b6b381fdbaa 100644 (file)
--- a/drivers/net/can/flexcan/flexcan-core.c
+++ b/drivers/net/can/flexcan/flexcan-core.c
@@ -742,7 +742,7 @@ static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *de
        u32 ctrl = FLEXCAN_MB_CODE_TX_DATA | ((can_fd_len2dlc(cfd->len)) << 16);
        int i;
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        netif_stop_queue(dev);

diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index 6c37aab93eb3ae0dfa9d38be0bc3067af1020a27..4bedcc3eea0d6726a821e2772ad45424a3be2872 100644 (file)
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1345,7 +1345,7 @@ static netdev_tx_t grcan_start_xmit(struct sk_buff *skb,
        unsigned long flags;
        u32 oneshotmode = priv->can.ctrlmode & CAN_CTRLMODE_ONE_SHOT;
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        /* Trying to transmit in silent mode will generate error interrupts, but

diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c
index 8d42b7e6661f2d37bd1f9414236bf4e0dc6d0ffa..07eaf724a57273c78f230442d865e7ab0b2d8046 100644 (file)
--- a/drivers/net/can/ifi_canfd/ifi_canfd.c
+++ b/drivers/net/can/ifi_canfd/ifi_canfd.c
@@ -860,7 +860,7 @@ static netdev_tx_t ifi_canfd_start_xmit(struct sk_buff *skb,
        u32 txst, txid, txdlc;
        int i;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        /* Check if the TX buffer is full */

diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index 71a2caae075792e230c768e212d265b654309f9a..0732a509214182943972ec6cbf8241d7404ea067 100644 (file)
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1693,7 +1693,7 @@ static netdev_tx_t ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
        void __iomem *desc_addr;
        unsigned long flags;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        spin_lock_irqsave(&mod->lock, flags);

diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c
index 4e9680c8eb3447ae18d3fa07530ed6f8bad47802..bcad11709bc98c989a9ea06ba5b3878704a04d48 100644 (file)
--- a/drivers/net/can/kvaser_pciefd.c
+++ b/drivers/net/can/kvaser_pciefd.c
@@ -772,7 +772,7 @@ static netdev_tx_t kvaser_pciefd_start_xmit(struct sk_buff *skb,
        int nwords;
        u8 count;
 
-       if (can_dropped_invalid_skb(netdev, skb))
+       if (can_dev_dropped_skb(netdev, skb))
                return NETDEV_TX_OK;
 
        nwords = kvaser_pciefd_prepare_tx_packet(&packet, can, skb);

diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index dcb582563d5e43c82b8421bdae2f127159ab2576..00d11e95fd98e1e983641fa7c5ce4798313c97c3 100644 (file)
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1721,7 +1721,7 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,
 {
        struct m_can_classdev *cdev = netdev_priv(dev);
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        if (cdev->is_peripheral) {

diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index 2119fbb287efc93281eece23236364cf4256f4e2..a6829cdc0e81f82cc88534a579c720e88209b76e 100644 (file)
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -191,7 +191,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
        int i, rtr, buf_id;
        u32 can_id;
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        out_8(&regs->cantier, 0);

diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 0558ff67ec6abf4841effc0270dc2bbf3ba71e92..2a44b2803e55543ae2107e2818158943b2f86f4f 100644 (file)
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -882,7 +882,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
        int i;
        u32 id2;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        tx_obj_no = priv->tx_obj;

diff --git a/drivers/net/can/peak_canfd/peak_canfd.c b/drivers/net/can/peak_canfd/peak_canfd.c
index f8420cc1d9075adca813b9d31e32d33b98e81dfe..31c9c127e24bbac05da8b5ec6552c2a05ba77ace 100644 (file)
--- a/drivers/net/can/peak_canfd/peak_canfd.c
+++ b/drivers/net/can/peak_canfd/peak_canfd.c
@@ -651,7 +651,7 @@ static netdev_tx_t peak_canfd_start_xmit(struct sk_buff *skb,
        int room_left;
        u8 len;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        msg_size = ALIGN(sizeof(*msg) + cf->len, 4);

diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index 6ee968c59ac90930272576c66a31be7b662cc5e4..cc43c9c5e38c58ac69a9826075cf578177ac5ede 100644 (file)
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -590,7 +590,7 @@ static netdev_tx_t rcar_can_start_xmit(struct sk_buff *skb,
        struct can_frame *cf = (struct can_frame *)skb->data;
        u32 data, i;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        if (cf->can_id & CAN_EFF_FLAG)  /* Extended frame format */

diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 198da643ee6dd72ace5192f197db59eff8d7b34d..d530e986f7fabb1f3a980f03594e47edd14bd2d7 100644 (file)
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -1481,7 +1481,7 @@ static netdev_tx_t rcar_canfd_start_xmit(struct sk_buff *skb,
        unsigned long flags;
        u32 ch = priv->channel;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        if (cf->can_id & CAN_EFF_FLAG) {

diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 1bb1129b04503364b403160d8612bfc4ad18ad15..aac5956e4a532092a0e67a0b57937ac10c8b4597 100644 (file)
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -291,7 +291,7 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb,
        u8 cmd_reg_val = 0x00;
        int i;
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        netif_stop_queue(dev);

diff --git a/drivers/net/can/slcan/slcan-core.c b/drivers/net/can/slcan/slcan-core.c
index 8d13fdf8c28a4a599de96003b1e2559fee8afc0f..fbb34139daa1a24c6e723f71512ca0981289bb5b 100644 (file)
--- a/drivers/net/can/slcan/slcan-core.c
+++ b/drivers/net/can/slcan/slcan-core.c
@@ -594,7 +594,7 @@ static netdev_tx_t slcan_netdev_xmit(struct sk_buff *skb,
 {
        struct slcan *sl = netdev_priv(dev);
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        spin_lock(&sl->lock);

diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index a5ef57f415f732320f93256c1383b57ec67a2f6f..c72f505d29feec565f0fff43d3a7f51240800405 100644 (file)
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -60,7 +60,7 @@ static netdev_tx_t softing_netdev_start_xmit(struct sk_buff *skb,
        struct can_frame *cf = (struct can_frame *)skb->data;
        uint8_t buf[DPRAM_TX_SIZE];
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        spin_lock(&card->spin);

diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c
index b87dc420428d99b51189412d6613d1d67388e861..e1b8533a602e28a69f6401dc5561ab7827b0f1ba 100644 (file)
--- a/drivers/net/can/spi/hi311x.c
+++ b/drivers/net/can/spi/hi311x.c
@@ -373,7 +373,7 @@ static netdev_tx_t hi3110_hard_start_xmit(struct sk_buff *skb,
                return NETDEV_TX_BUSY;
        }
 
-       if (can_dropped_invalid_skb(net, skb))
+       if (can_dev_dropped_skb(net, skb))
                return NETDEV_TX_OK;
 
        netif_stop_queue(net);

diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
index 24883a65ca66a3702c43b8661107f53d19fcabb0..79c4bab5f7246e1faa4411acb536c0254c9881ce 100644 (file)
--- a/drivers/net/can/spi/mcp251x.c
+++ b/drivers/net/can/spi/mcp251x.c
@@ -789,7 +789,7 @@ static netdev_tx_t mcp251x_hard_start_xmit(struct sk_buff *skb,
                return NETDEV_TX_BUSY;
        }
 
-       if (can_dropped_invalid_skb(net, skb))
+       if (can_dev_dropped_skb(net, skb))
                return NETDEV_TX_OK;
 
        netif_stop_queue(net);

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c
index ffb6c36b7d9bdea33cb60155ac58922eef3b49e1..160528d3cc26b1be4cd253df3ffb6837577bede9 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c
@@ -172,7 +172,7 @@ netdev_tx_t mcp251xfd_start_xmit(struct sk_buff *skb,
        u8 tx_head;
        int err;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        if (mcp251xfd_tx_busy(priv, tx_ring))

diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c
index 525309da1320a6bd98876d827f90b177efe88968..2b78f9197681b739d6b09693e714bc6bdd203b05 100644 (file)
--- a/drivers/net/can/sun4i_can.c
+++ b/drivers/net/can/sun4i_can.c
@@ -429,7 +429,7 @@ static netdev_tx_t sun4ican_start_xmit(struct sk_buff *skb, struct net_device *d
        canid_t id;
        int i;
 
-       if (can_dropped_invalid_skb(dev, skb))
+       if (can_dev_dropped_skb(dev, skb))
                return NETDEV_TX_OK;
 
        netif_stop_queue(dev);

diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index b218fb3c6b760d46c28564dcee919313d1e4a34e..27700f72eac259458deaf23542dac43ab358f472 100644 (file)
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -470,7 +470,7 @@ static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev)
        u32 mbxno, mbx_mask, data;
        unsigned long flags;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        mbxno = get_tx_head_mb(priv);

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index d31191686a549d3196aeac126c21ea51fb164dcc..050c0b49938a42a1cd84024ab98ad33cbe8bccca 100644 (file)
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -747,7 +747,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
        size_t size = CPC_HEADER_SIZE + CPC_MSG_HEADER_LEN
                        + sizeof(struct cpc_can_msg);
 
-       if (can_dropped_invalid_skb(netdev, skb))
+       if (can_dev_dropped_skb(netdev, skb))
                return NETDEV_TX_OK;
 
        /* create a URB, and a buffer for it, and copy the data to the URB */

diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c
index 1bcfad11b1e4448e75d56c26eeec5114b48ecc08..81b88e9e5bdc09f0305d85d132cd5d502afd324c 100644 (file)
--- a/drivers/net/can/usb/esd_usb.c
+++ b/drivers/net/can/usb/esd_usb.c
@@ -725,7 +725,7 @@ static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb,
        int ret = NETDEV_TX_OK;
        size_t size = sizeof(struct esd_usb_msg);
 
-       if (can_dropped_invalid_skb(netdev, skb))
+       if (can_dev_dropped_skb(netdev, skb))
                return NETDEV_TX_OK;
 
        /* create a URB, and a buffer for it, and copy the data to the URB */

diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.c b/drivers/net/can/usb/etas_es58x/es58x_core.c
index 51294b717040522e6de9accfbfc50ac33a5c5520..25f863b4f5f0618bbb07376c36452c4ec9004dd8 100644 (file)
--- a/drivers/net/can/usb/etas_es58x/es58x_core.c
+++ b/drivers/net/can/usb/etas_es58x/es58x_core.c
@@ -1913,7 +1913,7 @@ static netdev_tx_t es58x_start_xmit(struct sk_buff *skb,
        unsigned int frame_len;
        int ret;
 
-       if (can_dropped_invalid_skb(netdev, skb)) {
+       if (can_dev_dropped_skb(netdev, skb)) {
                if (priv->tx_urb)
                        goto xmit_commit;
                return NETDEV_TX_OK;

diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index f0065d40eb2410933a47492fd5c0defe91672947..9c2c25fde3d146375ab691a7192d57845654ac79 100644 (file)
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -723,7 +723,7 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb,
        unsigned int idx;
        struct gs_tx_context *txc;
 
-       if (can_dropped_invalid_skb(netdev, skb))
+       if (can_dev_dropped_skb(netdev, skb))
                return NETDEV_TX_OK;
 
        /* find an empty context to keep track of transmission */

diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
index e91648ed73862fe2ac114b391c9c5e233d79c03e..802e27c0ecedb2a7bb558534c9c4aadb9f473d4c 100644 (file)
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
@@ -570,7 +570,7 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,
        unsigned int i;
        unsigned long flags;
 
-       if (can_dropped_invalid_skb(netdev, skb))
+       if (can_dev_dropped_skb(netdev, skb))
                return NETDEV_TX_OK;
 
        urb = usb_alloc_urb(0, GFP_ATOMIC);

diff --git a/drivers/net/can/usb/mcba_usb.c b/drivers/net/can/usb/mcba_usb.c
index 69346c63021fee69a6bd9256d022ba9feb0cd56b..218b098b261df9a86fd747b02df37ff899245e09 100644 (file)
--- a/drivers/net/can/usb/mcba_usb.c
+++ b/drivers/net/can/usb/mcba_usb.c
@@ -311,7 +311,7 @@ static netdev_tx_t mcba_usb_start_xmit(struct sk_buff *skb,
                .cmd_id = MBCA_CMD_TRANSMIT_MESSAGE_EV
        };
 
-       if (can_dropped_invalid_skb(netdev, skb))
+       if (can_dev_dropped_skb(netdev, skb))
                return NETDEV_TX_OK;
 
        ctx = mcba_usb_get_free_ctx(priv, cf);

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index 225697d70a9aa3a7c9bb21b1617eecc9228d14b1..1d996d3320fef8e27fc8085f4bef6a4387e445aa 100644 (file)
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -351,7 +351,7 @@ static netdev_tx_t peak_usb_ndo_start_xmit(struct sk_buff *skb,
        int i, err;
        size_t size = dev->adapter->tx_buffer_size;
 
-       if (can_dropped_invalid_skb(netdev, skb))
+       if (can_dev_dropped_skb(netdev, skb))
                return NETDEV_TX_OK;
 
        for (i = 0; i < PCAN_USB_MAX_TX_URBS; i++)

diff --git a/drivers/net/can/usb/ucan.c b/drivers/net/can/usb/ucan.c
index 7c35f50fda4eea3ddc3db4afef9019967e2bd225..67c2ff407d06610c5036a9442b6f28e3079e9998 100644 (file)
--- a/drivers/net/can/usb/ucan.c
+++ b/drivers/net/can/usb/ucan.c
@@ -1120,7 +1120,7 @@ static netdev_tx_t ucan_start_xmit(struct sk_buff *skb,
        struct can_frame *cf = (struct can_frame *)skb->data;
 
        /* check skb */
-       if (can_dropped_invalid_skb(netdev, skb))
+       if (can_dev_dropped_skb(netdev, skb))
                return NETDEV_TX_OK;
 
        /* allocate a context and slow down tx path, if fifo state is low */

diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c
index 64c00abe91cf01d5e446a06251f0ebaffe171516..8a5596ce4e46312e6080a424e0107e0c22595267 100644 (file)
--- a/drivers/net/can/usb/usb_8dev.c
+++ b/drivers/net/can/usb/usb_8dev.c
@@ -602,7 +602,7 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb,
        int i, err;
        size_t size = sizeof(struct usb_8dev_tx_msg);
 
-       if (can_dropped_invalid_skb(netdev, skb))
+       if (can_dev_dropped_skb(netdev, skb))
                return NETDEV_TX_OK;
 
        /* create a URB, and a buffer for it, and copy the data to the URB */

diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 5d3172795ad01d4402a5d0164c74596af1f208f8..43c812ea1de02320c7e8da79fdd194864d8a45d8 100644 (file)
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -743,7 +743,7 @@ static netdev_tx_t xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        struct xcan_priv *priv = netdev_priv(ndev);
        int ret;
 
-       if (can_dropped_invalid_skb(ndev, skb))
+       if (can_dev_dropped_skb(ndev, skb))
                return NETDEV_TX_OK;
 
        if (priv->devtype.flags & XCAN_FLAG_TX_MAILBOXES)

diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 58f5431a555984a1683f70ddea5c63d40517322a..982ba245eb41ce701f529a4fa0fd95ec85da914a 100644 (file)
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -152,6 +152,22 @@ static inline bool can_is_canxl_dev_mtu(unsigned int mtu)
        return (mtu >= CANXL_MIN_MTU && mtu <= CANXL_MAX_MTU);
 }
 
+/* drop skb if it does not contain a valid CAN frame for sending */
+static inline bool can_dev_dropped_skb(struct net_device *dev, struct sk_buff *skb)
+{
+       struct can_priv *priv = netdev_priv(dev);
+
+       if (priv->ctrlmode & CAN_CTRLMODE_LISTENONLY) {
+               netdev_info_once(dev,
+                                "interface in listen only mode, dropping skb\n");
+               kfree_skb(skb);
+               dev->stats.tx_dropped++;
+               return true;
+       }
+
+       return can_dropped_invalid_skb(dev, skb);
+}
+
 void can_setup(struct net_device *dev);
 
 struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,