From: Jeremy Kerr <jk@codeconstruct.com.au>
Date: Thu, 25 Nov 2021 06:07:37 +0000 (+0800)
Subject: mctp: serial: cancel tx work on ldisc close
X-Git-Tag: block-5.17-2022-01-21~91^2~338^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7bd9890f3d74;p=linux-block.git

mctp: serial: cancel tx work on ldisc close

We want to ensure that the tx work has finished before returning from
the ldisc close op, so do a synchronous cancel.

Reported-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/drivers/net/mctp/mctp-serial.c b/drivers/net/mctp/mctp-serial.c
index 9ac0e187f36e..85b407f4df11 100644
--- a/drivers/net/mctp/mctp-serial.c
+++ b/drivers/net/mctp/mctp-serial.c
@@ -479,6 +479,7 @@ static void mctp_serial_close(struct tty_struct *tty)
 	int idx = dev->idx;
 
 	unregister_netdev(dev->netdev);
+	cancel_work_sync(&dev->tx_work);
 	ida_free(&mctp_serial_ida, idx);
 }