From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1898056-1516808175-2-9285352879263765799 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516808174; b=RNB9zR3Oag1b71hndS2Xk3HHNH4rcU4a7c5Q2QZNvNeflZA YVcZsR+6Eb9Mq53wrTqk/fSFlKNmSt5QjXKaW8xGrIBLOlPyL1aWNb3WGOcSIn69 5hjG7riVkVUTEpI8nkM52475m9oeI9Pq9rt2n0UO/FHjiDJ/ao06TVkSkTkhtaPF tm0hXExtlG6pUFDrGGB+peH0dthklVsIiCSs/ZvXo8zbX01akouN4xCeKG1mOS1V L10Zv4087KOEcSne5jwsrLTPSw0Kp1EVpYoda4HjVYW6oePOV55MfGUAkNMKciik mTGKyv5pFT/vVTmu9x3agirZBIQ6DqA2GTtRNGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:in-reply-to:message-id :date:sender:list-id; s=arctest; t=1516808174; bh=C4+g7XBBAI81OT z6PcyDysv0utVwc9Mu5GH4i2DMWUA=; b=B4nTRWaCdGSqbEBeUUaOEyveZUJy98 BG8aayw9YAzmDrF2lUmutmuv6k+xRAgEJHzK/p+Sv+oaNY+nA4gqA5j2PVE9bYHA CGuGna+ueNAjw/oOhzBEmh8O4ltqRX5mgj5TOj1Kcj+8zeS2GuQlGvjGh9TFzzKD fcCxK3MIMqGSyVTdRvvXWLlxbLPeLcAs2QsEzPcvC2Cd1VsEubNxFZckjNq1DT+6 Ha8G37RbKerSQ2Fu0SiI5Z5im66lSzsSSt80hjRRVOCzojSM1vzlao8WGqRa3rNd TlOiXJMN7U8bE3CjNM/7OLOV0mbrW/4SQbEPBCHqRBcUQ1bwmA54LUSg== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 1024-bit rsa key sha256) header.d=sirena.org.uk header.i=@sirena.org.uk header.b=r5EBZ2zM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=20170815-heliosphere; dmarc=none (p=none,has-list-id=yes,d=none) header.from=kernel.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=orgdomain_pass; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=kernel.org header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 1024-bit rsa key sha256) header.d=sirena.org.uk header.i=@sirena.org.uk header.b=r5EBZ2zM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=20170815-heliosphere; dmarc=none (p=none,has-list-id=yes,d=none) header.from=kernel.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=orgdomain_pass; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=kernel.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933995AbeAXPgN (ORCPT ); Wed, 24 Jan 2018 10:36:13 -0500 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:49904 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933953AbeAXPgM (ORCPT ); Wed, 24 Jan 2018 10:36:12 -0500 From: Mark Brown To: Marc Zyngier Cc: Mark Brown , stable@vger.kernel.org, Oder Chiou , Bard Liao , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Brian Norris , Takashi Iwai , alsa-devel@alsa-project.org Subject: Applied "ASoC: rt5514-spi: Check the validity of drvdata pointer on resume" to the asoc tree In-Reply-To: <20171216011230.107527-1-briannorris@chromium.org> Message-Id: Date: Wed, 24 Jan 2018 15:36:06 +0000 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: The patch ASoC: rt5514-spi: Check the validity of drvdata pointer on resume has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >>From 509bf3a7d43ab173abc354df2a859229ede043c0 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Wed, 24 Jan 2018 14:50:00 +0000 Subject: [PATCH] ASoC: rt5514-spi: Check the validity of drvdata pointer on resume The rt5514-spi driver seem to assume the validity of the drvdata pointer on resume, which it may not be populated, leading to a not-so-nice crash. This stems from the fact that rt5514_spi_pcm_probe() is never called on my system (a kevin Chromebook). No idea why, but if it can happen, it is worth fixing. Fixes: e9c50aa6bd39 ("ASoC: rt5514-spi: check irq status to schedule data copy in resume function") Signed-off-by: Marc Zyngier Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- sound/soc/codecs/rt5514-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 2df91db765ac..9255afcf2c3a 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -482,7 +482,7 @@ static int __maybe_unused rt5514_resume(struct device *dev) if (device_may_wakeup(dev)) disable_irq_wake(irq); - if (rt5514_dsp->substream) { + if (rt5514_dsp && rt5514_dsp->substream) { rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf, sizeof(buf)); if (buf[0] & RT5514_IRQ_STATUS_BIT) rt5514_schedule_copy(rt5514_dsp); -- 2.15.1