From patchwork Thu Apr 13 22:38:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 83107 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1362966vqo; Thu, 13 Apr 2023 15:41:04 -0700 (PDT) X-Google-Smtp-Source: AKy350b0RIHsw9FJdOjd1qQG4LOAOB1CKQaqTxNe2TzawYHM1qOo07YfHvH7YXUxzDcNk5UwqhPz X-Received: by 2002:a17:902:c951:b0:1a1:cc5a:b04 with SMTP id i17-20020a170902c95100b001a1cc5a0b04mr655408pla.3.1681425664614; Thu, 13 Apr 2023 15:41:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681425664; cv=none; d=google.com; s=arc-20160816; b=TbrZ+diVC74dp7Th5W5LVwda72bWbEQvd5xeVrSQKH0SuY/PXf9LpzR3ihSMvXbye4 xWS/6TjxYRa8zVZpX5cGalCn1vX1pkS4UtOO6CWmophe0SYEbgPIKjB9U5WnZidTGUQY z8+I6PEV2+tgHg5iBX0ImdoQMRJJhrzTP4saFEGORYmfWbw94U1B//Uh6/xT6ZublM6Z 8Iw2h8qSVANfHP0ebQWBfOiTmUnmDIZa2jiSUanknhMRSHAGLBGAuYlkUk6y4sK7QlJg Hqe8sL6gxvdLEAEs9gVl/LHIoJNgKluHRzBEiQPqUle19tXCK5DS4N70bj/V2esKlFlt HABw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TybroGbkAJmMo0JcdvwUsYqz/B/fSNany9JmWIbHsAw=; b=Erz0TAsAnphntuETjzmbBgkhO52USM9QHrrFwdJKbNJtnDXw19p4MvCXw53lVsiwqC VzT6ATBz+ARiYXxwE+tdRFTJrj6BEfYzGdBABKuabevsviLhEelOgQxYNlTnPpHXKcC3 bG6CgPapjMT4SmHxGS1dnTmQFwZXc+B3Mz05subSWo05ybRS6+4H3yOQjsSfIO6sqfOh po91UMqBCB+bsJtb+54H28DNCK8arV2dQhvqiPOIYvEd2TGkK5k2AiOalrWxtMsqm0sO fHo/f8VBmy8tKGsdL5aSineiWViSqwFCgsNkncj1K8Dg2omma9ArHa6vW1EBlUvTahH0 1Peg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qssvJRf3; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c15-20020a170902b68f00b0019f3c06fdfasi2885097pls.339.2023.04.13.15.40.52; Thu, 13 Apr 2023 15:41:04 -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=@kernel.org header.s=k20201202 header.b=qssvJRf3; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230284AbjDMWio (ORCPT + 99 others); Thu, 13 Apr 2023 18:38:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229893AbjDMWij (ORCPT ); Thu, 13 Apr 2023 18:38:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28D834488 for ; Thu, 13 Apr 2023 15:38:38 -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 dfw.source.kernel.org (Postfix) with ESMTPS id B583064220 for ; Thu, 13 Apr 2023 22:38:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63885C433A0; Thu, 13 Apr 2023 22:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681425517; bh=vbdX/dqmOVMZruNpFyND398jkZY5rXuYcUVR0aNvnBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qssvJRf3K0pi3IuIBrMMpDzmw12YfJrKrGRAhNS5fEnV5xcLGOJpgWpu1mm+z4JBa nLcAMKWksxGJgqIM4JX6/ysp5DQiEUZtwjWGVhWnyfiEDG/wchVW6QXcdI+R+5/mYH yHYU5YMJjF8ASWdeVkNCEaqBsoCCMjP7LVqOS00k1zO80+5hXKjBRYZFDHaalUoVO/ LcFz/CL4ErwL9HsuJutzVYiEqP6XEoTX29tA+Lyz2z0c3AtLLINfOQQIDKJYjSk2Na /2M/Uy9XS2avnRCte4sAX0sbsKyVJ6lIDyjzGh6ermTSk6SGadFjGclQLCbfBR8NOK 4/m6pL95N4g0Q== From: Stephen Boyd To: Greg Kroah-Hartman Cc: Jishnu Prakash , linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH 6/6] spmi: Add a check for remove callback when removing a SPMI driver Date: Thu, 13 Apr 2023 15:38:34 -0700 Message-ID: <20230413223834.4084793-7-sboyd@kernel.org> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog In-Reply-To: <20230413223834.4084793-1-sboyd@kernel.org> References: <20230413223834.4084793-1-sboyd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1763102597774595735?= X-GMAIL-MSGID: =?utf-8?q?1763102597774595735?= From: Jishnu Prakash When removing a SPMI driver, there can be a crash due to NULL pointer dereference if it does not have a remove callback defined. This is one such call trace observed when removing the QCOM SPMI PMIC driver: dump_backtrace.cfi_jt+0x0/0x8 dump_stack_lvl+0xd8/0x16c panic+0x188/0x498 __cfi_slowpath+0x0/0x214 __cfi_slowpath+0x1dc/0x214 spmi_drv_remove+0x16c/0x1e0 device_release_driver_internal+0x468/0x79c driver_detach+0x11c/0x1a0 bus_remove_driver+0xc4/0x124 driver_unregister+0x58/0x84 cleanup_module+0x1c/0xc24 [qcom_spmi_pmic] __do_sys_delete_module+0x3ec/0x53c __arm64_sys_delete_module+0x18/0x28 el0_svc_common+0xdc/0x294 el0_svc+0x38/0x9c el0_sync_handler+0x8c/0xf0 el0_sync+0x1b4/0x1c0 If a driver has all its resources allocated through devm_() APIs and does not need any other explicit cleanup, it would not require a remove callback to be defined. Hence, add a check for remove callback presence before calling it when removing a SPMI driver. Signed-off-by: Jishnu Prakash Link: https://lore.kernel.org/r/1671601032-18397-2-git-send-email-quic_jprakash@quicinc.com Fixes: 6f00f8c8635f ("mfd: qcom-spmi-pmic: Use devm_of_platform_populate()") Fixes: 5a86bf343976 ("spmi: Linux driver framework for SPMI") Signed-off-by: Stephen Boyd --- drivers/spmi/spmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c index 5705151013b3..7313d4c18a04 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c @@ -350,7 +350,8 @@ static void spmi_drv_remove(struct device *dev) const struct spmi_driver *sdrv = to_spmi_driver(dev->driver); pm_runtime_get_sync(dev); - sdrv->remove(to_spmi_device(dev)); + if (sdrv->remove) + sdrv->remove(to_spmi_device(dev)); pm_runtime_put_noidle(dev); pm_runtime_disable(dev);