Commit 30ffd533 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

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

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: e057dd3f ("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: default avatarDerek Will <derekrobertwill@gmail.com>
Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 3ea56642

net/can/isotp.c

+4 −0
Original line number Diff line number Diff line
@@ -1046,12 +1046,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;