Merge tag 'nfsd-5.11' of git://git.linux-nfs.org/projects/cel/cel-2.6

[linux-2.6-microblaze.git] / net / can / isotp.c

diff --git a/net/can/isotp.c b/net/can/isotp.c
index 26bdc3c..7839c3b 100644 (file)
--- a/net/can/isotp.c
+++ b/net/can/isotp.c
@@ -865,6 +865,14 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
        if (!size || size > MAX_MSG_LENGTH)
                return -EINVAL;
 
+       /* take care of a potential SF_DL ESC offset for TX_DL > 8 */
+       off = (so->tx.ll_dl > CAN_MAX_DLEN) ? 1 : 0;
+
+       /* does the given data fit into a single frame for SF_BROADCAST? */
+       if ((so->opt.flags & CAN_ISOTP_SF_BROADCAST) &&
+           (size > so->tx.ll_dl - SF_PCI_SZ4 - ae - off))
+               return -EINVAL;
+
        err = memcpy_from_msg(so->tx.buf, msg, size);
        if (err < 0)
                return err;
@@ -891,9 +899,6 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
        cf = (struct canfd_frame *)skb->data;
        skb_put(skb, so->ll.mtu);
 
-       /* take care of a potential SF_DL ESC offset for TX_DL > 8 */
-       off = (so->tx.ll_dl > CAN_MAX_DLEN) ? 1 : 0;
-
        /* check for single frame transmission depending on TX_DL */
        if (size <= so->tx.ll_dl - SF_PCI_SZ4 - ae - off) {
                /* The message size generally fits into a SingleFrame - good.
@@ -1016,7 +1021,7 @@ static int isotp_release(struct socket *sock)
        hrtimer_cancel(&so->rxtimer);
 
        /* remove current filters & unregister */
-       if (so->bound) {
+       if (so->bound && (!(so->opt.flags & CAN_ISOTP_SF_BROADCAST))) {
                if (so->ifindex) {
                        struct net_device *dev;
 
@@ -1052,15 +1057,25 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len)
        struct net_device *dev;
        int err = 0;
        int notify_enetdown = 0;
+       int do_rx_reg = 1;
 
        if (len < CAN_REQUIRED_SIZE(struct sockaddr_can, can_addr.tp))
                return -EINVAL;
 
-       if (addr->can_addr.tp.rx_id == addr->can_addr.tp.tx_id)
-               return -EADDRNOTAVAIL;
+       /* do not register frame reception for functional addressing */
+       if (so->opt.flags & CAN_ISOTP_SF_BROADCAST)
+               do_rx_reg = 0;
+
+       /* do not validate rx address for functional addressing */
+       if (do_rx_reg) {
+               if (addr->can_addr.tp.rx_id == addr->can_addr.tp.tx_id)
+                       return -EADDRNOTAVAIL;
+
+               if (addr->can_addr.tp.rx_id & (CAN_ERR_FLAG | CAN_RTR_FLAG))
+                       return -EADDRNOTAVAIL;
+       }
 
-       if ((addr->can_addr.tp.rx_id | addr->can_addr.tp.tx_id) &
-           (CAN_ERR_FLAG | CAN_RTR_FLAG))
+       if (addr->can_addr.tp.tx_id & (CAN_ERR_FLAG | CAN_RTR_FLAG))
                return -EADDRNOTAVAIL;
 
        if (!addr->can_ifindex)
@@ -1093,13 +1108,14 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len)
 
        ifindex = dev->ifindex;
 
-       can_rx_register(net, dev, addr->can_addr.tp.rx_id,
-                       SINGLE_MASK(addr->can_addr.tp.rx_id), isotp_rcv, sk,
-                       "isotp", sk);
+       if (do_rx_reg)
+               can_rx_register(net, dev, addr->can_addr.tp.rx_id,
+                               SINGLE_MASK(addr->can_addr.tp.rx_id),
+                               isotp_rcv, sk, "isotp", sk);
 
        dev_put(dev);
 
-       if (so->bound) {
+       if (so->bound && do_rx_reg) {
                /* unregister old filter */
                if (so->ifindex) {
                        dev = dev_get_by_index(net, so->ifindex);
@@ -1302,7 +1318,7 @@ static int isotp_notifier(struct notifier_block *nb, unsigned long msg,
        case NETDEV_UNREGISTER:
                lock_sock(sk);
                /* remove current filters & unregister */
-               if (so->bound)
+               if (so->bound && (!(so->opt.flags & CAN_ISOTP_SF_BROADCAST)))
                        can_rx_unregister(dev_net(dev), dev, so->rxid,
                                          SINGLE_MASK(so->rxid),
                                          isotp_rcv, sk);