]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
can: gw: give feedback on missing CGW_FLAGS_CAN_IIF_TX_OK flag
authorOliver Hartkopp <socketcan@hartkopp.net>
Wed, 25 Jan 2023 05:54:07 +0000 (06:54 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 2 Feb 2023 14:42:10 +0000 (15:42 +0100)
To send CAN traffic back to the incoming interface a special flag has to
be set. When creating a routing job for identical interfaces without this
flag the rule is created but has no effect.

This patch adds an error return value in the case that the CAN interfaces
are identical but the CGW_FLAGS_CAN_IIF_TX_OK flag was not set.

Reported-by: Jannik Hartung <jannik.hartung@tu-bs.de>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/all/20230125055407.2053-1-socketcan@hartkopp.net
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
net/can/gw.c

index 23a3d89cad81d82a3590f6b397b113736081cc17..37528826935e7454d84fff0de306ccdcdf4e0b8e 100644 (file)
@@ -1139,6 +1139,13 @@ static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh,
        if (gwj->dst.dev->type != ARPHRD_CAN)
                goto out;
 
+       /* is sending the skb back to the incoming interface intended? */
+       if (gwj->src.dev == gwj->dst.dev &&
+           !(gwj->flags & CGW_FLAGS_CAN_IIF_TX_OK)) {
+               err = -EINVAL;
+               goto out;
+       }
+
        ASSERT_RTNL();
 
        err = cgw_register_filter(net, gwj);