From nobody Fri Dec 19 07:00:44 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3EDCC28B2B for ; Mon, 15 Aug 2022 20:52:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346032AbiHOUwD (ORCPT ); Mon, 15 Aug 2022 16:52:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346288AbiHOUuH (ORCPT ); Mon, 15 Aug 2022 16:50:07 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EC92B99FA; Mon, 15 Aug 2022 12:09:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id D72E0CE12C4; Mon, 15 Aug 2022 19:09:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C76F3C433C1; Mon, 15 Aug 2022 19:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660590564; bh=3fm56voGlBMufrAF3Z9RjuxGbxgbRM8mf6liRp3l0UQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cdnytPmzWAriUYc1/gIGLM7jsV2nxFI6IVulP00y/iGCVBQhDYwiEO0LDpPMB+uXC cET0Pi+1ny2w6uViasEqrhXGjXf9AvCg6eTRljnYy/1Dt/q0EcTATdcDGejLa0wI0j 4wHw1th4BSE08h7fWHRje6uYOzITpqffCl43xVqQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yang Yingliang , Conor Dooley , Mark Brown , Sasha Levin Subject: [PATCH 5.18 0269/1095] spi: Fix simplification of devm_spi_register_controller Date: Mon, 15 Aug 2022 19:54:28 +0200 Message-Id: <20220815180440.876024149@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Yang Yingliang [ Upstream commit 43cc5a0afe4184a7fafe1eba32b5a11bb69c9ce0 ] This reverts commit 59ebbe40fb51 ("spi: simplify devm_spi_register_controller"). If devm_add_action() fails in devm_add_action_or_reset(), devm_spi_unregister() will be called, it decreases the refcount of 'ctlr->dev' to 0, then it will cause uaf in the drivers that calling spi_put_controller() in error path. Fixes: 59ebbe40fb51 ("spi: simplify devm_spi_register_controller") Signed-off-by: Yang Yingliang Reviewed-by: Conor Dooley Link: https://lore.kernel.org/r/20220712135504.1055688-1-yangyingliang@huaw= ei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index e1065768c537..6a8850e62078 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3068,9 +3068,9 @@ int spi_register_controller(struct spi_controller *ct= lr) } EXPORT_SYMBOL_GPL(spi_register_controller); =20 -static void devm_spi_unregister(void *ctlr) +static void devm_spi_unregister(struct device *dev, void *res) { - spi_unregister_controller(ctlr); + spi_unregister_controller(*(struct spi_controller **)res); } =20 /** @@ -3089,13 +3089,22 @@ static void devm_spi_unregister(void *ctlr) int devm_spi_register_controller(struct device *dev, struct spi_controller *ctlr) { + struct spi_controller **ptr; int ret; =20 + ptr =3D devres_alloc(devm_spi_unregister, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + ret =3D spi_register_controller(ctlr); - if (ret) - return ret; + if (!ret) { + *ptr =3D ctlr; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } =20 - return devm_add_action_or_reset(dev, devm_spi_unregister, ctlr); + return ret; } EXPORT_SYMBOL_GPL(devm_spi_register_controller); =20 --=20 2.35.1