Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1725988ybz; Sat, 18 Apr 2020 07:14:45 -0700 (PDT) X-Google-Smtp-Source: APiQypIz4qJk7fD9/RmZ66x8CBu45/btvOQCPj4rFMfLr0VsgkKfjJAkU+fvw+4W/Ich5en7ph/B X-Received: by 2002:a17:906:340a:: with SMTP id c10mr8101667ejb.218.1587219285614; Sat, 18 Apr 2020 07:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587219285; cv=none; d=google.com; s=arc-20160816; b=lrvbJJ2gemQe4cY/ShXmYOhSkyxXBgpVnfsT5r8TgI3iRueb2n/LRfSSdqub/6gken pfkwlYCzx0naVhtXSNB04ocL+ThQY3c3v/peYbSUsC7CUESUfMo+Fv0S38ds7DdI/FTi 1svzoyaFLxhUuJZ4GoJya4moKMhSu+AATyHeDu6nDFSGcNaPuLrAuXpMitGRdctxb+RM DNeMshlCFJ8cRrgi5K+dhHUj3VnnP3OqPqooxuzdwlPAa269OqAPVA4SqzfU/Ux6bvHO z78YVh0aDvFxue9isk5yDKugc7RZ+pN45XDSqk1iWo8WLVQ0QP+AgGVdvYZzrBRTe4UG J0oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HaqCqKFuSoXzwIT3C7NDIwVGCwuxG0co4hQZ3SzVqYw=; b=HSSN/sE529jO1v4oQw8Xov9mxIRndwuanjW7/iU81U/wpIEPiNlo1hL3ktj9U1MGES 7QxeZeY3KF718gl+iZXD+eyIsZc2T7Lo0eEx4eew1oxB+xdXDXqzs+iUPR17M7VZ2zS+ PgN5hqUQ9y1wKyPGOPZiRQbfMVGgQpzughDSQRBKGQg76GMRkdgSmTUmMOoq2yKfLIF+ rLMqLGsEM2/+qB6rIVm3sNNLP73Ji1mLRHEpks31N8mg03CPVwOhMmNX7Wo4kN28EwJi /1063+u0PlopdZx1CXK9t8NBZJH+SNwnErY2PmExabWF6SjLL96HfmfoGq0UrIB8uBiI 362w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iYm6q5Iu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id fi25si12413132ejb.25.2020.04.18.07.14.22; Sat, 18 Apr 2020 07:14:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iYm6q5Iu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1727989AbgDROKq (ORCPT + 99 others); Sat, 18 Apr 2020 10:10:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:38952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727906AbgDROKh (ORCPT ); Sat, 18 Apr 2020 10:10:37 -0400 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 0E07121D6C; Sat, 18 Apr 2020 14:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587219036; bh=TxGvwKirdzeH0HzqPaUcNdhQgOWVsAZkw7r9reHCr2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iYm6q5Iu4kLKtFBiWgK5bRAXcyGiFF18Fts59Kresfg+YwjIB1fF3PAJDNAuNX0DK htdqtyYl1wmZj77y08rACp4jMFy3I/MncrhS9AnM6ojvvbruCJ4db2CR7VuaDpOJNt f47gNXft1+kydGg1virsGyd5a/EHL+dkKzdnYxFA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kai Vehmanen , Pierre-Louis Bossart , Mark Brown , Sasha Levin , sound-open-firmware@alsa-project.org, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.5 70/75] ASoC: SOF: trace: fix unconditional free in trace release Date: Sat, 18 Apr 2020 10:09:05 -0400 Message-Id: <20200418140910.8280-70-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418140910.8280-1-sashal@kernel.org> References: <20200418140910.8280-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kai Vehmanen [ Upstream commit e6110114d18d330c05fd6de9f31283fd086a5a3a ] Check if DMA pages were successfully allocated in initialization before calling free. For many types of memory (like sgbufs) the extra free is harmless, but not all backends track allocation state, so add an explicit check. Signed-off-by: Kai Vehmanen Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20200124213625.30186-5-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/trace.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c index b0e4556c8536a..5bf63fa67fb09 100644 --- a/sound/soc/sof/trace.c +++ b/sound/soc/sof/trace.c @@ -343,7 +343,10 @@ void snd_sof_free_trace(struct snd_sof_dev *sdev) snd_sof_release_trace(sdev); - snd_dma_free_pages(&sdev->dmatb); - snd_dma_free_pages(&sdev->dmatp); + if (sdev->dma_trace_pages) { + snd_dma_free_pages(&sdev->dmatb); + snd_dma_free_pages(&sdev->dmatp); + sdev->dma_trace_pages = 0; + } } EXPORT_SYMBOL(snd_sof_free_trace); -- 2.20.1