Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.200.110.1.12\))
Subject: [PATCH] tty: synclink_gt: unwind actions in error path of net device
 open
From:   Paul Fulghum <paulkf@microgate.com>
In-Reply-To: <Y3PIA04FCxqv3eKn@kroah.com>
Date:   Tue, 15 Nov 2022 09:38:32 -0800
Cc:     Zhengchao Shao <shaozhengchao@huawei.com>,
        "linux-kernel@vger.kernel.org Mailing List" 
        <linux-kernel@vger.kernel.org>, Jiri Slaby <jirislaby@kernel.org>,
        akpm@linux-foundation.org, weiyongjun1@huawei.com,
        yuehaibing@huawei.com
Content-Transfer-Encoding: quoted-printable
Message-Id: <7599F007-8985-4469-BE00-52BD1530210E@microgate.com>
References: <20221114010734.314910-1-shaozhengchao@huawei.com>
 <4DFE07D7-B041-4C1C-8182-020066D4A5C2@microgate.com>
 <387F9F7B-C3AF-45BF-94ED-59348990B407@microgate.com>
 <Y3PIA04FCxqv3eKn@kroah.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Precedence: bulk

Resent again, last attempt still altered the plain text.


Zhengchao Shao <shaozhengchao@huawei.com> identified by inspection bugs =
in the error path of hdlcdev_open() in synclink_gt.c

The function did not fully unwind actions in the error path. The use of =
try_module_get()/module_put() is unnecessary, potentially hazardous and =
is removed. The synclink_gt driver is already pinned any point the net =
device is registered, a requirement for calling this entry point.

The call hdlc_open() to init the generic HDLC layer is moved to after =
driver level init/checks and proper rollback of previous actions is =
added. This is a more sensible ordering as the most common error paths =
are at the driver level and the driver level rollbacks require less =
processing than hdlc_open()/hdlc_close().

This has been tested with supported hardware.

Signed-off-by:Paul Fulghum <paulkf@microgate.com>

diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 25e9befdda3a..72b76cdde534 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -1433,16 +1433,8 @@ static int hdlcdev_open(struct net_device *dev)
 	int rc;
 	unsigned long flags;
=20
-	if (!try_module_get(THIS_MODULE))
-		return -EBUSY;
-
 	DBGINFO(("%s hdlcdev_open\n", dev->name));
=20
-	/* generic HDLC layer open processing */
-	rc =3D hdlc_open(dev);
-	if (rc)
-		return rc;
-
 	/* arbitrate between network and tty opens */
 	spin_lock_irqsave(&info->netlock, flags);
 	if (info->port.count !=3D 0 || info->netcount !=3D 0) {
@@ -1461,6 +1453,16 @@ static int hdlcdev_open(struct net_device *dev)
 		return rc;
 	}
=20
+	/* generic HDLC layer open processing */
+	rc =3D hdlc_open(dev);
+	if (rc) {
+		shutdown(info);
+		spin_lock_irqsave(&info->netlock, flags);
+		info->netcount =3D 0;
+		spin_unlock_irqrestore(&info->netlock, flags);
+		return rc;
+	}
+
 	/* assert RTS and DTR, apply hardware settings */
 	info->signals |=3D SerialSignal_RTS | SerialSignal_DTR;
 	program_hw(info);
@@ -1506,7 +1508,6 @@ static int hdlcdev_close(struct net_device *dev)
 	info->netcount=3D0;
 	spin_unlock_irqrestore(&info->netlock, flags);
=20
-	module_put(THIS_MODULE);
 	return 0;
 }
=20