Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp3702038yba; Tue, 7 May 2019 05:50:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7WHCtEwvNi3JRBtJrrYdwGZd1WwFzokXOIO3Fji36w5yFAq39e+hWzpOmzpCHwrGgRIeA X-Received: by 2002:a17:902:aa48:: with SMTP id c8mr18588864plr.130.1557233457409; Tue, 07 May 2019 05:50:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557233457; cv=none; d=google.com; s=arc-20160816; b=xalZvZ5LkZruivr0FDqsf/fCONEoq9/fR/lD+Up5+LS7yhoc+I0pySdkSxYNnzfkzM n7WcBZQ2drKN4dtACe/npAmhm8fPWy55/+hDrm+b9yUzk6Bz+bu3tUDNlGhjQ7F9zSXK jz20ClsN3+rPLGizto3qJNdCajsH6GNZRYkS1CS7YHnYJiBhdTOW8jd/vkrWiQSfEf2U DmNgCZjKz9FHC8MfIuwjUgEvtgE5sQR2rR/39IQEB/h/30KEc71zxXasiwgWOLu4uMp4 VbbSvIl85/G6M8S71SJ51q+IEZOT6HVAwrPtFqTTzUAtDp0uOa/FEv1kkeW3UZcLj7HZ Fi0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=GmXSj80z39cSLOykThWSEpAfhdjlTDPKWhpF/ovRPw4=; b=WhYW59WKx7U0/NP/hDWt7rHnOVJNywiFivPVB0Q1CID+FAzTblp/hCRNweSqQE+Cac SE/ejJ/58owyqiFdal847u3QptQ4FzRXaoS8KHXhNq3zyUOZIJ/fqnJe4PjXTMjPCguN h9X9k7LpbCSIK6yQxPBOd2p67X57e7VcJU4YLb+BnQDHXADJBVyLI3TcgSJref2UB/Nm vN2/ccA5gbBoqSJiRtnqLvsdyJ0xe2/eXFzPikzicLbp92YNfe2YGV0rd14MgfTeD4rQ bhY3GHQn9KmayXw9DEPysJhNtZWWY1odMS0wNalu01GXjbtukJa+j08+d27Jzzuae5CE SpKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VBku6dTJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r2si1387568pgi.92.2019.05.07.05.50.41; Tue, 07 May 2019 05:50:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VBku6dTJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726698AbfEGMtc (ORCPT + 99 others); Tue, 7 May 2019 08:49:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:35402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726159AbfEGMtb (ORCPT ); Tue, 7 May 2019 08:49:31 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 9FAFD205C9; Tue, 7 May 2019 12:49:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557233371; bh=XdAjnHt4EB6PZ/2o9+t02PkKMJ9elm5fJFbn7IRzPm4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VBku6dTJ6/vky557fEKpwHtjeHJlfREJk0WNBZE7pCtr+3S6OfATQdhOR0zn2c2p0 AnhZGHFxL9Jd/ldP+yg9HXiYkgWEGFCThDcy/dC8ZZ2OxZjub820VPyiIWhDi6nRl8 JQAI2XWznaGPYzhpU87bdlMDfn9370j34AG5ZDBI= Date: Tue, 7 May 2019 14:49:28 +0200 From: Greg Kroah-Hartman To: Nobuhiro Iwamatsu Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Charles Keepax , Mark Brown Subject: Re: [PATCH 4.19 79/99] ASoC: wm_adsp: Correct handling of compressed streams that restart Message-ID: <20190507124928.GA10118@kroah.com> References: <20190506143053.899356316@linuxfoundation.org> <20190506143101.240836871@linuxfoundation.org> <20190507174430.2e981704@fdyp522> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190507174430.2e981704@fdyp522> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 07, 2019 at 05:44:30PM +0900, Nobuhiro Iwamatsu wrote: > Hi, > > On Mon, May 06, 2019 at 04:32:52PM +0200, Greg Kroah-Hartman wrote: > > From: Charles Keepax > > > > commit 639e5eb3c7d67e407f2a71fccd95323751398f6f upstream. > > > > Previously support was added to allow streams to be stopped and > > started again without the DSP being power cycled and this was done > > by clearing the buffer state in trigger start. Another supported > > use-case is using the DSP for a trigger event then opening the > > compressed stream later to receive the audio, unfortunately clearing > > the buffer state in trigger start destroys the data received > > from such a trigger. Correct this issue by moving the call to > > wm_adsp_buffer_clear to be in trigger stop instead. > > > > Fixes: 61fc060c40e6 ("ASoC: wm_adsp: Support streams which can start/stop with DSP active") > > Signed-off-by: Charles Keepax > > Signed-off-by: Mark Brown > > Signed-off-by: Greg Kroah-Hartman > > This commit has other problems, and it is fixed by commit 43d147be5738a9ed6cfb25c285ac50d6dd5793be. > Please apply this commit too. > > commit 43d147be5738a9ed6cfb25c285ac50d6dd5793be > Author: Charles Keepax > Date: Tue Apr 2 13:49:14 2019 +0100 > > ASoC: wm_adsp: Check for buffer in trigger stop > > Trigger stop can be called in situations where trigger start failed > and as such it can't be assumed the buffer is already attached to > the compressed stream or a NULL pointer may be dereferenced. > > Fixes: 639e5eb3c7d6 ("ASoC: wm_adsp: Correct handling of compressed streams that restart") > Signed-off-by: Charles Keepax > Signed-off-by: Mark Brown Thank you, now queued up! greg k-h