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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 3FC6AC2D0DB for ; Fri, 24 Jan 2020 14:20:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03A082077C for ; Fri, 24 Jan 2020 14:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875636; bh=a3q3AfdfpnZz0utkiLplW6HuR5hV2vd1W/olLkrViE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Oxro883EhX7sVqBlu+ycNxKwpWo3PcBpLGhhlgzXBC/jCj6WLpKeOx0Cx6HPBV/uM 3DryU/3eI/WzDtZuP0DZ1qteU8cYqg7EFqH70mOK2qTuFALeildX0V4IqcpMRJ/Ujt FK1k3IRTBRvY7QGKsj3cNkTjCpo/3uMGCPm/OTLU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392151AbgAXOUf (ORCPT ); Fri, 24 Jan 2020 09:20:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:41714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392053AbgAXOUe (ORCPT ); Fri, 24 Jan 2020 09:20:34 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 654762467B; Fri, 24 Jan 2020 14:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875634; bh=a3q3AfdfpnZz0utkiLplW6HuR5hV2vd1W/olLkrViE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i2aIZULskj195JrkSohACxoSZmhSUm7vMmNu5kZOvvIUotEJLjNHpM4PNBOoWkqDi eFsSLINjtnQRNS6TjG3H/38TgYc0f98FIfKVF0xvMxZAMuCnm5pwyAmlNGLmF5i6b6 aa4UbiRZPVTAKw/J+13+4jotLGI966IFanSnCxhc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Osipenko , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.19 18/56] ASoC: rt5640: Fix NULL dereference on module unload Date: Fri, 24 Jan 2020 09:19:34 -0500 Message-Id: <20200124142012.29752-18-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124142012.29752-1-sashal@kernel.org> References: <20200124142012.29752-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dmitry Osipenko [ Upstream commit 89b71b3f02d8ae5a08a1dd6f4a2098b7b868d498 ] The rt5640->jack is NULL if jack is already disabled at the time of driver's module unloading. Signed-off-by: Dmitry Osipenko Link: https://lore.kernel.org/r/20200106014707.11378-1-digetx@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt5640.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 27770143ae8f2..974e1a4491723 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2435,6 +2435,13 @@ static void rt5640_disable_jack_detect(struct snd_soc_component *component) { struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component); + /* + * soc_remove_component() force-disables jack and thus rt5640->jack + * could be NULL at the time of driver's module unloading. + */ + if (!rt5640->jack) + return; + disable_irq(rt5640->irq); rt5640_cancel_work(rt5640); -- 2.20.1