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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 16631C35247 for ; Mon, 3 Feb 2020 16:44:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7C8220838 for ; Mon, 3 Feb 2020 16:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580748245; bh=a3q3AfdfpnZz0utkiLplW6HuR5hV2vd1W/olLkrViE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=P+ORaihyKG/GmBZUBXpShIMFGQZRX+nLeFG0aq+wtnfRsf8TuvugfvT0FY1i5EF2J /9fZvnTprxeblXO38W3wH5pwavgctZx540jauvm8i6lg8HQq2Zl4cfT5nM4CsTmENZ olEi9fNt1TKCnYcdStYbOtmMy5E3fvvmBix1yKIk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731562AbgBCQoD (ORCPT ); Mon, 3 Feb 2020 11:44:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:45922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730385AbgBCQcP (ORCPT ); Mon, 3 Feb 2020 11:32:15 -0500 Received: from localhost (unknown [104.132.45.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9203921582; Mon, 3 Feb 2020 16:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580747535; bh=a3q3AfdfpnZz0utkiLplW6HuR5hV2vd1W/olLkrViE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vB6NtdYe+0yb8Q2LxxOchww3jLtc+mqWOpDv+C5oJ4dvWyHK53TMwHZvccknlDruO PvsnrG4aeMOOZTLCTFknLp8g2rbY/kAPuoa7o0vC6k7eBzbtgu+g8vfc8bl5PZxq3H TETPRarAfecdz5TQiQfcw0xDm6ZPTR0ow974+dLU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Osipenko , Mark Brown , Sasha Levin Subject: [PATCH 4.19 34/70] ASoC: rt5640: Fix NULL dereference on module unload Date: Mon, 3 Feb 2020 16:19:46 +0000 Message-Id: <20200203161917.459061865@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200203161912.158976871@linuxfoundation.org> References: <20200203161912.158976871@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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