From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FD10C433ED for ; Sun, 2 May 2021 14:10:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A538611EE for ; Sun, 2 May 2021 14:10:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233691AbhEBOLC (ORCPT ); Sun, 2 May 2021 10:11:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:51998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233872AbhEBOIA (ORCPT ); Sun, 2 May 2021 10:08:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 64CF4613D7; Sun, 2 May 2021 14:06:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619964395; bh=vcXjnd0RVtjp9wv8OGxIBH6Btu3mKLehj10zJxynX8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uuCpSzIRAKIq58QUWKAuOvfbduZ61dixdMOB9hsLDyxcjergc74TGbUellDtNV79K dljE1sd+fpCiwS6O7p9sv7bNiiUMy8xah15nSoiKQn8syOCyL1y+KDRAAPxfqRxYVk p3atNMxs1pWeHZoDyl1BXblOq5ATFuqXGaowW/kzbdxTE0musZOcp9hrqPNY4PFjNm fsPpUoyVO4Huy/kBbqcv4ki5ERnXC8nqGWD2gqYVnMm5bOAdZQHukVI77lFraBveTj 456KCgY6X92iGRkPVtlJ92PNhYI//mvOIAb0BehrqTy85l7Jer4BZVHraxdXaGozwu DA30wuUpRSiyg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Yingliang , Hulk Robot , Vinod Koul , Greg Kroah-Hartman , Sasha Levin , linux-phy@lists.infradead.org Subject: [PATCH AUTOSEL 4.4 09/10] phy: phy-twl4030-usb: Fix possible use-after-free in twl4030_usb_remove() Date: Sun, 2 May 2021 10:06:21 -0400 Message-Id: <20210502140623.2720479-9-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210502140623.2720479-1-sashal@kernel.org> References: <20210502140623.2720479-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yingliang [ Upstream commit e1723d8b87b73ab363256e7ca3af3ddb75855680 ] This driver's remove path calls cancel_delayed_work(). However, that function does not wait until the work function finishes. This means that the callback function may still be running after the driver's remove function has finished, which would result in a use-after-free. Fix by calling cancel_delayed_work_sync(), which ensures that the work is properly cancelled, no longer running, and unable to re-schedule itself. Reported-by: Hulk Robot Signed-off-by: Yang Yingliang Link: https://lore.kernel.org/r/20210407092716.3270248-1-yangyingliang@huawei.com Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/phy/phy-twl4030-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c index f96065a81d1e..168780eb29aa 100644 --- a/drivers/phy/phy-twl4030-usb.c +++ b/drivers/phy/phy-twl4030-usb.c @@ -753,7 +753,7 @@ static int twl4030_usb_remove(struct platform_device *pdev) usb_remove_phy(&twl->phy); pm_runtime_get_sync(twl->dev); - cancel_delayed_work(&twl->id_workaround_work); + cancel_delayed_work_sync(&twl->id_workaround_work); device_remove_file(twl->dev, &dev_attr_vbus); /* set transceiver mode to power on defaults */ -- 2.30.2