From patchwork Mon Mar 13 16:42:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 68935 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1293123wrd; Mon, 13 Mar 2023 09:51:51 -0700 (PDT) X-Google-Smtp-Source: AK7set8vANDIY7LEDQ99CwgORZGymlmd3sxZ/C6Nw8TdKtykVFlfhGRzEBogA4k4qT6NEi9gKwtb X-Received: by 2002:a05:6a20:12c2:b0:d4:e688:c6da with SMTP id v2-20020a056a2012c200b000d4e688c6damr2083183pzg.36.1678726311466; Mon, 13 Mar 2023 09:51:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678726311; cv=none; d=google.com; s=arc-20160816; b=f8e0Ao1vU3AePENxjvHRBL3p63anslpkamLunDsN6oPwhemjH4corCycv39Iwph89Q rjvWXl31vv+h4r+mmaUrA3CQlplbenJit28hXK+Pah2+kx9it7zSWrYVDuJI8ecvoWYk Lc/7XWkUGEcDXHBHZb3IBnzto3y8HWbkiiS3bHFK2RS0vCT79ZRVwGXanTJ3RqHGu71R W/rV03IvZJ+q4p/5dS1Wgm1ubMTxtuu1J8ITtfWnJ/SBXPHDB6lAeXWlxc3XpUvRQ0uy 1RBKA0I0qLdq+H2lABFOruU0vv8NpJHJ9Q9gibMCNMVTjgo/Diw8PBRaa8b0OwRP/MU0 kPFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=39Xf9ZCAokng5zx5EHKJyi5I1FpmWCObH+80VGR+3Fc=; b=Fq3RiduLDM8QJQhg06vv4zjQp6lotFnpnMlFwI+ph1cpYeWOBPUuxT3J7pjP6gkMsM pJLEfzFYkUfpxXvFhhrEHIr4C83cI2/uPnrfTziBeB3pLb+jaurAOz0PW2cghPWKRkqB H9xbbInU3C5ynd9mJZ3PC7mL5H0OhiqYws38UjGoCUwNqASsDOAROMf6QjjzVZFO4gZn YMXuCmJm7HovYfiVUJS3q4e1oUbN9wpI4jlrz7h9udpBMRGaz3LwYaZt5jd/ct10ZjyW OxCEOctPrpPtY+ShR/e7ZHUfcaDCQVEh/lg13k9aHwvoKaWRCLvc6VI4E/O6DjaHipk/ F4xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=LL9L3M7H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k8-20020a654648000000b004faf0a78c50si6784645pgr.110.2023.03.13.09.51.38; Mon, 13 Mar 2023 09:51:51 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=LL9L3M7H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229801AbjCMQne (ORCPT + 99 others); Mon, 13 Mar 2023 12:43:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230025AbjCMQn2 (ORCPT ); Mon, 13 Mar 2023 12:43:28 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.215]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1BB7E1ADCB; Mon, 13 Mar 2023 09:43:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=39Xf9 ZCAokng5zx5EHKJyi5I1FpmWCObH+80VGR+3Fc=; b=LL9L3M7H5q7z1LfesmT5d Jndz0co5jyxSDfOI+ndvIM/i6L40TEpdFpRsSjU8ejx8cwNGjWBhThLin4sWgGm3 1WWO/gQcro/fPCU/u3xDhdlykezjStMlT5r4b6+X+IxgMi+MTyv+0Iro70ipT8NM 7OkpwqCRIGd97RIVoFlBdo= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by zwqz-smtp-mta-g3-0 (Coremail) with SMTP id _____wDn7yNtUg9kfkYUAA--.18807S2; Tue, 14 Mar 2023 00:42:21 +0800 (CST) From: Zheng Wang To: ezequiel@vanguardiasur.com.ar Cc: hverkuil@xs4all.nl, mchehab@kernel.org, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, hackerzheng666@gmail.com, 1395428693sheep@gmail.com, alex000young@gmail.com, Zheng Wang Subject: [PATCH v2] media: rkvdec: fix use after free bug in rkvdec_remove Date: Tue, 14 Mar 2023 00:42:20 +0800 Message-Id: <20230313164220.3753961-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wDn7yNtUg9kfkYUAA--.18807S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Cw4kWFWrZF4rKr45ury8Krg_yoW8Gw4Upr W3ta45Cay5JF4UKFnrtr4xZa4rGryUKFykKr9rXa43ZryfJFnrJ3sYyF1UCFWxXrZ3Z3y3 CFyYqw1rXw4qyrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziID73UUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/1tbiXA8xU1Xl56P-uQAAsD X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760272120931121260?= X-GMAIL-MSGID: =?utf-8?q?1760272120931121260?= In rkvdec_probe, rkvdec->watchdog_work is bound with rkvdec_watchdog_func. Then rkvdec_vp9_run may be called to start the work. If we remove the module which will call rkvdec_remove to make cleanup, there may be a unfinished work. The possible sequence is as follows, which will cause a typical UAF bug. Fix it by canceling the work before cleanup in rkvdec_remove. CPU0 CPU1 |rkvdec_watchdog_func rkvdec_remove | rkvdec_v4l2_cleanup| v4l2_m2m_release | kfree(m2m_dev); | | | v4l2_m2m_get_curr_priv | m2m_dev->curr_ctx //use Fixes: cd33c830448b ("media: rkvdec: Add the rkvdec driver") Signed-off-by: Zheng Wang --- v2: - use cancel_delayed_work_sync instead of cancel_delayed_work suggested Hans Verkuil --- drivers/staging/media/rkvdec/rkvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index 7bab7586918c..82806f198074 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -1066,6 +1066,8 @@ static int rkvdec_remove(struct platform_device *pdev) { struct rkvdec_dev *rkvdec = platform_get_drvdata(pdev); + cancel_delayed_work_sync(&rkvdec->watchdog_work); + rkvdec_v4l2_cleanup(rkvdec); pm_runtime_disable(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev);