linux-can.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: Marc Kleine-Budde <mkl@pengutronix.de>,
	Oliver Hartkopp <socketcan@hartkopp.net>,
	Sottas Guillaume <Guillaume.Sottas@liebherr.com>
Subject: [PATCH RFC] can: isotp: isotp_sendmsg(): return error on FC timeout on TX path
Date: Thu,  6 May 2021 15:36:22 +0200	[thread overview]
Message-ID: <20210506133622.1336101-1-mkl@pengutronix.de> (raw)

Link: https://github.com/hartkopp/can-isotp/pull/43
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Sottas Guillaume (LMB) <Guillaume.Sottas@liebherr.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Hey Sottas,

can you check if this fixes your problem and that normal operation
still works.

regards,
Marc

 net/can/isotp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/can/isotp.c b/net/can/isotp.c
index 9f94ad3caee9..823f047a28ad 100644
--- a/net/can/isotp.c
+++ b/net/can/isotp.c
@@ -954,6 +954,9 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
 	if (wait_tx_done) {
 		/* wait for complete transmission of current pdu */
 		wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE);
+
+		if (sk->sk_err)
+			return sk->sk_err;
 	}
 
 	return size;
-- 
2.30.2



             reply	other threads:[~2021-05-06 13:36 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-06 13:36 Marc Kleine-Budde [this message]
2021-05-06 17:36 ` [PATCH RFC] can: isotp: isotp_sendmsg(): return error on FC timeout on TX path Oliver Hartkopp
2021-05-07 10:00   ` Marc Kleine-Budde
2021-05-07 12:29 Sottas Guillaume (LMB)
2021-05-07 12:50 ` Marc Kleine-Budde
2021-05-07 14:12   ` Oliver Hartkopp
2021-05-07 14:18     ` Marc Kleine-Budde
     [not found]       ` <b3efce9895784f8ab6f5dee8ae03c604@liebherr.com>
2021-10-19  7:05         ` Marc Kleine-Budde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210506133622.1336101-1-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=Guillaume.Sottas@liebherr.com \
    --cc=linux-can@vger.kernel.org \
    --cc=socketcan@hartkopp.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).