From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 209C842BC4E; Thu, 16 Jul 2026 13:50:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784209832; cv=none; b=jT+4XqXu1es8fJ8qzSqvXFLCtqfhneBwYs3pwMBZpNLM8foDU6DHKvis2OLrZ7OaAFLnddKZgBNC7ZQF+kSbL8VUYzBpmmyZOJE79lkvoYXGKsPc+ioGI58rUxS9vKV+gVAQbdU6G3cy3JRx02GJXqiTaJMhAUGgwOlFPJEGIsc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784209832; c=relaxed/simple; bh=q2bQyat9Ra28Gq86muGCwYn2c3kLwJaHNjo52ShUPQg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gLLjDy2zkVKWsDnCOmXJ/pgT8JY7avh0B5no0AHW0BtyPTTu30GMgiHv4h0XvA93VKgf/hesyri4vVyLD+cjjgSH8KVU1DqEQK/VEl4+5IFjt08KZwe/18cgh/NrKVVQZNc0NR5TwdQPHQtnLjFSoyyzMZnH41YTHttQHBf6BEM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hWS2Dw3u; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hWS2Dw3u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 869B01F00A3A; Thu, 16 Jul 2026 13:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784209831; bh=arbi78malYKFZJ0yudcgCxyMPiA69lFFbzL5vE9jnJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hWS2Dw3ubCj32qqQ0T+F7Ex0nirtMWvbH6bSnWJzKhAmB4zWvIFyb0goF3kUHJFBy +mQKmo2foPSaKRynfwTdHFhsM0dgvZawQBGZedF88LyYPvtfJe+NBBOXVW0p3MsbrN C3y/T9+aqNX4exNHP3t6cJLQehnA4zgHbut10AWU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Fan Wu , Heikki Krogerus Subject: [PATCH 7.1 334/518] usb: typec: ucsi: ccg: Fix use-after-free of ucsi on remove Date: Thu, 16 Jul 2026 15:30:02 +0200 Message-ID: <20260716133055.118552228@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260716133047.772246337@linuxfoundation.org> References: <20260716133047.772246337@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fan Wu commit 1f0bdc2884b67de337215079bba166df0cdf4ac5 upstream. The threaded IRQ handler ccg_irq_handler() calls ucsi_notify_common(), which on a connector-change event calls ucsi_connector_change() and schedules connector work. In ucsi_ccg_remove(), ucsi_destroy() frees uc->ucsi (kfree) before free_irq() is called, so a handler invocation already in flight may access the freed object after ucsi_destroy(). CPU 0 (remove) | CPU 1 (threaded IRQ) ucsi_destroy(uc->ucsi) | ccg_irq_handler() kfree(ucsi) // FREE | ucsi_notify_common(uc->ucsi) // USE Move free_irq() before ucsi_destroy() in the remove path. It is kept after ucsi_unregister(): ucsi_unregister() cancels connector work whose handler issues GET_CONNECTOR_STATUS through ucsi_send_command_common(), which waits for a completion that is signalled from the IRQ handler, so the IRQ must stay active until that work has been cancelled. The probe error path already orders free_irq() before ucsi_destroy(). This bug was found by static analysis. Fixes: e32fd989ac1c ("usb: typec: ucsi: ccg: Move to the new API") Cc: stable Signed-off-by: Fan Wu Reviewed-by: Heikki Krogerus Link: https://patch.msgid.link/20260616132011.103279-1-fanwu01@zju.edu.cn Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/ucsi_ccg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -1519,8 +1519,8 @@ static void ucsi_ccg_remove(struct i2c_c cancel_work_sync(&uc->work); pm_runtime_disable(uc->dev); ucsi_unregister(uc->ucsi); - ucsi_destroy(uc->ucsi); free_irq(uc->irq, uc); + ucsi_destroy(uc->ucsi); } static const struct of_device_id ucsi_ccg_of_match_table[] = {