can: isotp: return -EADDRNOTAVAIL when reading from unbound socket

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit 30ffd5332e06316bd69a654c06aa033872979b7c ]

When reading from an unbound can-isotp socket the syscall blocked
indefinitely. As unbound sockets (without given CAN address information)
do not make sense anyway we directly return -EADDRNOTAVAIL on read()
analogue to the known behavior from sendmsg().

Fixes: e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol")
Link: https://github.com/linux-can/can-utils/issues/349
Link: https://lore.kernel.org/all/20220316164258.54155-2-socketcan@hartkopp.net
Suggested-by: Derek Will <derekrobertwill@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 05e4e7d9bbb3cbdc1eeb65ddf439f28edfdf38c2)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/net/can/isotp.c b/net/can/isotp.c
index f8e3aeb79e3fb127b5edeb84164215916d3d3b96..8966f06e066093256abd117b607df75b0f2b1edf 100644 (file)
--- a/net/can/isotp.c
+++ b/net/can/isotp.c
@@ -1005,12 +1005,16 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
 {
        struct sock *sk = sock->sk;
        struct sk_buff *skb;
+       struct isotp_sock *so = isotp_sk(sk);
        int err = 0;
        int noblock;
 
        noblock = flags & MSG_DONTWAIT;
        flags &= ~MSG_DONTWAIT;
 
+       if (!so->bound)
+               return -EADDRNOTAVAIL;
+
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
                return err;