From: Lv Ruyi <lv.ruyi@zte.com.cn>
Date: Tue, 30 Nov 2021 11:24:43 +0000 (+0000)
Subject: net: mscc: ocelot: fix mutex_lock not released
X-Git-Tag: howlett/maple/20220722_2~1498^2~292
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9c32950f24f9e7df158887bdc80e5b79fbf5ed8d;p=users%2Fjedix%2Flinux-maple.git

net: mscc: ocelot: fix mutex_lock not released

If err is true, the function will be returned, but mutex_lock isn't
released.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index fe8abb30f185..b1856d8c944b 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -1651,8 +1651,10 @@ int ocelot_hwstamp_set(struct ocelot *ocelot, int port, struct ifreq *ifr)
 	}
 
 	err = ocelot_setup_ptp_traps(ocelot, port, l2, l4);
-	if (err)
+	if (err) {
+		mutex_unlock(&ocelot->ptp_lock);
 		return err;
+	}
 
 	if (l2 && l4)
 		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;