From:   Meng Li <Meng.Li@windriver.com>
To:     stable@vger.kernel.org, davem@davemloft.net, kuba@kernel.org,
        mcoquelin.stm32@gmail.com, linux@armlinux.org.uk, andrew@lunn.ch,
        qiangqing.zhang@nxp.com
Cc:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        meng.li@windriver.com
Subject: [PATCH 3/6] net: stmmac: fix missing unlock on error in stmmac_suspend()
Date:   Fri, 19 Nov 2021 10:53:56 +0800
Message-Id: <20211119025359.30815-4-Meng.Li@windriver.com>
In-Reply-To: <20211119025359.30815-1-Meng.Li@windriver.com>
References: <20211119025359.30815-1-Meng.Li@windriver.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KBrzLxz4s+5238+NWlgl3/RZUlGvEjjGN2lCjkCjWYI5BibchdzZAnYbqK+v?=
 =?us-ascii?Q?qD9KFf4O8c8y8Av834trrrThqAflDlkBfBQnvPWE+S/LtkwRzYiFJUXzPjdz?=
 =?us-ascii?Q?v9qK6tJEh6w+AsKoGrngc7BpnjUKjp3JFG0WQUOeNnNNTn7IrM7G7NiVAj3l?=
 =?us-ascii?Q?/JikqFb/rC64RPC1VxwhBeDlRlbJRwFDDBFIm+19VulFw5pSsNbyHudk5kKV?=
 =?us-ascii?Q?eHil3Ex8TLB/i1fqMzmKeIOb46YwW29Ww3hXpSklX3HCtu0BSFu6rpFroH28?=
 =?us-ascii?Q?vbacH4iCYA81IikRK5L8qmpzBiy2WDdMOC8aCkoTXvVn2fyt2ZBd8sKnIbo0?=
 =?us-ascii?Q?AiKTDjeGQwBdTAqKBW9O2lJf6h7cze0VrF1LFqp0CnheIHGvP8KjRIUFNViC?=
 =?us-ascii?Q?o3Euu2RDwxINpesZ2DaRKIwS+fNVw09FjF4q4KZ+Oj3kx3nY+go/bg81NnjB?=
 =?us-ascii?Q?2HnQW7hIlRX2VvhV1a+X3kOpwbOnrjF7mNloLPLFMWOm8u8XgR4cZ1G+S6/p?=
 =?us-ascii?Q?wdMldbJIBLNWNMYqlaEihHjjo7IoKTrVZ2jJGwjILv40ZUdBtL2EYM8M+pSa?=
 =?us-ascii?Q?4o65/IkQ/1Lk+y9+lbcfNdBW5vGECkzis0NDI1z+01Yz6zkE5GPJEjTrYyBj?=
 =?us-ascii?Q?5OyK0hVweAnMI82x6cyw0cmz0eJjEIfX0iX80SbaBQHoluCORQSFJD0TeVbp?=
 =?us-ascii?Q?Ev55ut10OpL5lFrIGLF7EzTO6xPsDr6yUltGd4PieiYOnC9d0VpH7OZvynVJ?=
 =?us-ascii?Q?QAx1pL/rJo+2IH7ZnXIXPr8V65QKjK6HkxabX+kR02+Pg+WeJRLY0D/loevL?=
 =?us-ascii?Q?NwzQNojE6sLS1wB2CwwU4w2MHEkwYRDUtZYoQpY2RfiBZbDrOaUN2DFfyc1t?=
 =?us-ascii?Q?bNaE+0I6SIZ3aj/LAYPKax2HDTx98P+cWk9IwQOdTkGWVrEQrznHfQ+lC0CH?=
 =?us-ascii?Q?ph6cWoczwAFNPrGTsAMjtl08mW9FNqYkK69u7muOmch53yxRwboTh/F62X/X?=
 =?us-ascii?Q?uc4l4U8StdmYNPq/ezClt4zaXa0/unT7DkMxEX2WyAq4lAsCjLeGCTldRQ/r?=
 =?us-ascii?Q?Ysyy6s8hm7rwVTv4yhxPfJNaFIshcNky110xgasGBKxgNjHi5h5hz0bH9Tox?=
 =?us-ascii?Q?oqRtaBYpFk6eXwOmUyZEarBaMsK8jXmgBssxmvxXAVrrBa3E08rIL+6jrnxJ?=
 =?us-ascii?Q?L0nWzRlS/69C063gQ/wyaZXXrKl8IE+OYthCNBRV/w3Gd44eu/FmxOR5iT/V?=
 =?us-ascii?Q?G3656++8OyylV2LqwsWmjAYb9mpRQ8vOWizdAlZetinY9dyzeN5h7Rz9dhjS?=
 =?us-ascii?Q?zk6+OONtoPmRIOoYNLOA25ZyPOLqCHM6MDmZS7XDr4kZ+8g/uXqyxXYOj0Ed?=
 =?us-ascii?Q?JHr/UtYRTmcH08tj0UVEGIWvy4glAig8nsO69xTGoIgEVLcquVClT+tqJXrJ?=
 =?us-ascii?Q?r6l2CPYLxL1jGMsVk+AXV+yTBHL/RkWIOzR9vHCerd9gRsVmD2RQpOzTA/9l?=
 =?us-ascii?Q?IbFFx7oqSyzk7uNiocFNG9mK+C8q3NMHg1U/E9CAsKIuFj/NJD/mv+IVRPeg?=
 =?us-ascii?Q?qp5TIjDqNemx4v2CdfOUQt/2X4koKK2vH/uckeBnrKJ6AYV7kx/LKn5QkXGe?=
 =?us-ascii?Q?328FPB2uQtb5pRXIeKokNcc=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ecba7704-33f4-48d1-2dde-08d9ab07e80a
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2021 02:54:29.8575
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Ntf6THgovjvuH4AQxxBpBAty7auf/KrefaD0lxIBqFQPlFG8NZV9K/nTqfD60kNYBEzegG85Mb/Sa0bPTFYW5Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4951
X-Proofpoint-GUID: nXMg5miZmutp2QQcomsupaNwMr3oRGkb
X-Proofpoint-ORIG-GUID: nXMg5miZmutp2QQcomsupaNwMr3oRGkb
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475
 definitions=2021-11-19_02,2021-11-17_01,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=844
 priorityscore=1501 malwarescore=0 phishscore=0 lowpriorityscore=0
 suspectscore=0 clxscore=1015 adultscore=0 impostorscore=0 mlxscore=0
 bulkscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2110150000 definitions=main-2111190012
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Yang Yingliang <yangyingliang@huawei.com>

commit 30f347ae7cc1178c431f968a89d4b4a375bc0d39 upstream

Add the missing unlock before return from stmmac_suspend()
in the error handling case.

Fixes: 5ec55823438e ("net: stmmac: add clocks management for gmac driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 498962c4b59e..51626edc6a4c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5275,8 +5275,10 @@ int stmmac_suspend(struct device *dev)
 		/* Disable clock in case of PWM is off */
 		clk_disable_unprepare(priv->plat->clk_ptp_ref);
 		ret = pm_runtime_force_suspend(dev);
-		if (ret)
+		if (ret) {
+			mutex_unlock(&priv->lock);
 			return ret;
+		}
 	}
 	mutex_unlock(&priv->lock);
 
-- 
2.17.1