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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 2B3F1C04E53 for ; Wed, 15 May 2019 12:17:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F23CE206BF for ; Wed, 15 May 2019 12:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922677; bh=oHPELByl9M22/Gl9ucSlDkC3SSx/IiY/03J/tm8ILx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fHvIoMIzEU4fRxpjxT6QnkxYurlqerZq3X3DzYBCKSKte0seJ9d04lQdx7w3mGcVb wr7p7wW4dxNQsAnRgg36EFXNM/oe1w3exyugk8tzNxVhL23hfElQTBoNx4ci8OjD2o 80lX0hJeTCxbn1u64dfvOh3NRvHvXS59QRpreGTk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727733AbfEOLBn (ORCPT ); Wed, 15 May 2019 07:01:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:58714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727754AbfEOLBk (ORCPT ); Wed, 15 May 2019 07:01:40 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9BA8F216FD; Wed, 15 May 2019 11:01:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918100; bh=oHPELByl9M22/Gl9ucSlDkC3SSx/IiY/03J/tm8ILx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JjWuzzo9vm+w1HBU6NE4MTsBB3i2vx0zlNftbM+Eyir7GBtIBIZeWaR/dkBBnZaOl O0+nwisRKEAynxDhFdaEH02gVuceEDGnh6sQOh39HMneZN+/MkBpTXgxZ+eAOpx1xG iN4YACqySrcyKudJ/pyK1PV/rFsPGCcsMeaQYSGg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sven Van Asbroeck , Jonathan Cameron , Sasha Levin Subject: [PATCH 3.18 65/86] iio: adc: xilinx: fix potential use-after-free on remove Date: Wed, 15 May 2019 12:55:42 +0200 Message-Id: <20190515090654.643286016@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090642.339346723@linuxfoundation.org> References: <20190515090642.339346723@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 62039b6aef63380ba7a37c113bbaeee8a55c5342 ] When cancel_delayed_work() returns, the delayed work may still be running. This means that the core could potentially free the private structure (struct xadc) while the delayed work is still using it. This is a potential use-after-free. Fix by calling cancel_delayed_work_sync(), which waits for any residual work to finish before returning. Signed-off-by: Sven Van Asbroeck Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/adc/xilinx-xadc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index a483747cdc9b9..b520de11fc17f 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1315,7 +1315,7 @@ static int xadc_remove(struct platform_device *pdev) } free_irq(irq, indio_dev); clk_disable_unprepare(xadc->clk); - cancel_delayed_work(&xadc->zynq_unmask_work); + cancel_delayed_work_sync(&xadc->zynq_unmask_work); kfree(xadc->data); kfree(indio_dev->channels); -- 2.20.1