can: isotp: remove re-binding of bound socket
Subsystems (2)
Oliver Hartkopp
maintainerPATCH 1/1 can: isotp: remove re-binding of bound socket
As a carry over from the CAN_RAW socket (which allows to change the CAN interface while mantaining the filter setup) the re-binding of the CAN_ISOTP socket needs to take care about CAN ID address information and subscriptions. It turned out that this feature is so limited (e.g. the sockopts remain fix) that it finally has never been needed/used.
In opposite to the stateless CAN_RAW socket the switching of the CAN ID subscriptions might additionally lead to an interrupted ongoing PDU reception. So better remove this unneeded complexity.
--- net/can/isotp.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-)
net/can/isotp.c +5 -20
@@ -1187,24 +1187,25 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len)if (!addr->can_ifindex)return -ENODEV ;lock_sock (sk); +if (so->bound) { + err = -EINVAL ; + goto out; + } +/* 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 && rx_id == tx_id) { err = -EADDRNOTAVAIL ; goto out; } -if (so->bound && addr->can_ifindex == so->ifindex && - rx_id == so->rxid && tx_id == so->txid) - goto out; - dev =dev_get_by_index (net, addr->can_ifindex);if (!dev) { err = -ENODEV ; goto out; }
@@ -1235,26 +1236,10 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len) isotp_rcv_echo, sk, "isotpe", sk); }dev_put (dev); -if (so->bound && do_rx_reg) { -/* unregister old filter */ -if (so->ifindex) { - dev =dev_get_by_index (net, so->ifindex); -if (dev) { -can_rx_unregister (net, dev, so->rxid, -SINGLE_MASK (so->rxid), - isotp_rcv, sk); -can_rx_unregister (net, dev, so->txid, -SINGLE_MASK (so->txid), - isotp_rcv_echo, sk); -dev_put (dev); - } - } - } -/* switch to new settings */ so->ifindex = ifindex; so->rxid = rx_id; so->txid = tx_id; so->bound =1 ;
Signature · 1 line
2.30.2
Marc Kleine-Budde
maintainerHello Oliver,
Quoted 6 lines · Oliver Hartkopp
As a carry over from the
CAN_RAWsocket (which allows to change the CAN interface while mantaining the filter setup) the re-binding of theCAN_ISOTPsocket needs to take care about CAN ID address information and subscriptions. It turned out that this feature is so limited (e.g. the sockopts remain fix) that it finally has never been needed/used.
Quoted 6 lines
In opposite to the stateless
CAN_RAWsocket the switching of the CAN ID subscriptions might additionally lead to an interrupted ongoing PDU reception. So better remove this unneeded complexity.Fixes e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol")Signed-off-by Oliver Hartkopp <[email protected]>
Which branch should I apply the patch to?
[ ] can
[ ] can+stable
[ ] can-next
regards,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Oliver Hartkopp
maintainer[x] can+stable please!
Many thanks,
Oliver
Quoted 25 lines · Marc Kleine-Budde
Hello Oliver,
Quoted 6 lines · Oliver Hartkopp
As a carry over from the
CAN_RAWsocket (which allows to change the CAN interface while mantaining the filter setup) the re-binding of theCAN_ISOTPsocket needs to take care about CAN ID address information and subscriptions. It turned out that this feature is so limited (e.g. the sockopts remain fix) that it finally has never been needed/used.Quoted 6 lines
In opposite to the stateless
CAN_RAWsocket the switching of the CAN ID subscriptions might additionally lead to an interrupted ongoing PDU reception. So better remove this unneeded complexity.Fixes e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol")Signed-off-by Oliver Hartkopp <[email protected]>Which branch should I apply the patch to?
[ ] can
[ ] can+stable
[ ] can-nextregards,
Marc