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;
From:   You Kangren <youkangren@vivo.com>
To:     Thomas Gleixner <tglx@linutronix.de>,
        linux-kernel@vger.kernel.org (open list:POSIX CLOCKS and TIMERS)
Cc:     opensource.kernel@vivo.com, youkangren@vivo.com
Subject: [PATCH] posix-timers: Release the acquired lock before returning
Date:   Mon, 26 Jun 2023 20:00:17 +0800
Message-Id: <20230626120017.3030-1-youkangren@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8SO7/3sKMdoTyaEh+4smMYYAy8+9WQtjpV6V3XXlIk0JmTfyj8P2seZBhxae?=
 =?us-ascii?Q?XF5Ckb65NsfT8yQ0apHB1B3DzaWQizISOAjKBW9Q7+efH7KUf2c0HW++xjbh?=
 =?us-ascii?Q?0268ol1PH/+jDGXkcwcmg0ZySaJVNGhxm5vbPBEVyTHKDJr+FU60TRcdH/jJ?=
 =?us-ascii?Q?MBCnu/cONN49KeD9i+ysaSPm8UYvF0TeCJwciABvW2oRIk65UzQvVWiGYvyS?=
 =?us-ascii?Q?iHWTyPim2F7o8FyQqhrJL2H3mRP3wrnrJtJUXTV7F0Livb6tGgTEINN1v1aS?=
 =?us-ascii?Q?dazqJpLFrCLCxEiFt/SnU8aQTpi5OPIdiY5NBlE9YMgYPhxPuCPWxa6iZnwJ?=
 =?us-ascii?Q?2QLiw49WZ/C/M3vXi8Tg2elBPxMP5+9oSzK/WskTvvFsN/7Tkk8JIEZ7CI5/?=
 =?us-ascii?Q?CZr8GkpTwD2RrpWpgAhVfdY9sVrBNdFixXg7Tl4RG2ctrQ2vIMYDP6ZB5yuS?=
 =?us-ascii?Q?kFx6JLzU+SuUItaxEC0ssEYZJ24c9gJ/0Zt+29S0Ld+5yId7vJOdubSvU6Vr?=
 =?us-ascii?Q?Ief5QStLwC7JzSI7PJ22yiQ80h0WtfhvwKcGz1LNS4uJYGbBlLQ7FeRZVTPw?=
 =?us-ascii?Q?KjhueboKnDKcGFimXPCHS9dms/qoREvQ9eNxII+iHvfPUsjJrAqmcSy83ScX?=
 =?us-ascii?Q?gEBgHpH3n3Dcc87siorzVOntJ5T6nT6nT4ze6gDEl46at0ouSqxin44YbA8k?=
 =?us-ascii?Q?fgJxXiMr327k19f/N062+FY0xfkT/Ci/8LF3/NKSG+hzoQEaZ3G47DMsZbLx?=
 =?us-ascii?Q?r8t7HbuyszAq4OBomu70uB+adoU0WASoisNiqpD5srG8fGVJXupOjBrgEl+f?=
 =?us-ascii?Q?o5uL8oORm+bsicCqGxv0oFt8X5wc4Kf3By/OyjWiswAWDW/aX/y4cP+S2pXY?=
 =?us-ascii?Q?WYxRNL622/PM1KSuXi1UK6MFhMG+HY7F/fXy0FDe/TdclPAGj0/bHF2MHsbt?=
 =?us-ascii?Q?MRNerOm363PD4vpX49KLEl7f9xQuLnxue5gjX/iitIOc5xG8BuYu+yC8dE7Y?=
 =?us-ascii?Q?6I5cilf4bpq5HbsjTaFIUFy63SjnsGZF9oPxJ3y6Ru+opJYlWu3jq7ZMGI0r?=
 =?us-ascii?Q?JBsURAYQAxaCnlROts1ki6bp+FPGhz+zxvmKlsANyqBSTl987/zlLKGk1KmN?=
 =?us-ascii?Q?JYDakK9s3mpayWcwynNorBXqsUsWPDa3CkIUUyViwD+vG0A+ts7tTOqw1mJb?=
 =?us-ascii?Q?nl5oTQapQTkM1lczOB7YK/GIk1Po26vISnHUTP+trFIY15H6+sX1q+7TDJFn?=
 =?us-ascii?Q?8iU6tHPoe2rjtaBW24u6eW6JZdWZ0gaeoYaa9hFsHe9tzA8X2aH1CYza83ZR?=
 =?us-ascii?Q?1NX78L4PaJlx4Jd++jxc/BXZqdSXLwZbfmLbKEBZnPBUc1RXESZwf7zeoMP8?=
 =?us-ascii?Q?jQJJY9GptzGGmXUIyGMW39xwM98b/MmSiRnsztYm8Bj18fzDcQDVy85O8TPn?=
 =?us-ascii?Q?iSvQxb1TX5MdJbmJwcKPTG1q1uKIFYmMbjZb8SLj8jm32wsqY90FVGRzX9P7?=
 =?us-ascii?Q?1yG8OSc+4LGRINxcHgFIyngtz0JS0DvcYny950XPDqxAFnf5JlS/zREpsOIT?=
 =?us-ascii?Q?4S46JfLDO4EFNdhxRayjLXEPe9vwKx1zLQzLSG0a?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2c606663-c699-4dab-9c73-08db763ceba7
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2023 12:00:22.9188
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: beK8cuVTVPR+DFy5zfPjV4UHnTqy0OWpi+RXkeWRwLrcAqAbHlhtl0R87Zi/T1K5IAu0QmYJMBGyKMD++7fENQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6754
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Release the acquired lock before returning to prevent errors

Signed-off-by: You Kangren <youkangren@vivo.com>
---
 kernel/time/posix-timers.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index b924f0f096fa..8ab383cba0af 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -599,6 +599,7 @@ static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags)
 		 */
 		if (timr->it_signal == current->signal) {
 			rcu_read_unlock();
+			spin_unlock_irqrestore(&timr->it_lock, *flags);
 			return timr;
 		}
 		spin_unlock_irqrestore(&timr->it_lock, *flags);
@@ -1066,9 +1067,10 @@ static void itimer_delete(struct k_itimer *timer)
 		 * do_exit() only for the last thread of the thread group.
 		 * So no other task can access and delete that timer.
 		 */
-		if (WARN_ON_ONCE(timer_wait_running(timer, &flags) != timer))
+		if (WARN_ON_ONCE(timer_wait_running(timer, &flags) != timer)) {
+			spin_unlock_irqrestore(&timer->it_lock, flags);
 			return;
-
+		}
 		goto retry_delete;
 	}
 	list_del(&timer->list);
-- 
2.39.0