Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp62757ybh; Fri, 2 Aug 2019 18:05:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqxpNng0GxXeam4jaUsVyeJQ3bNFzu3uP70zfV9MkinUBCFAnY/C95qCqOEvcm/g4haYRpZD X-Received: by 2002:a63:607:: with SMTP id 7mr17266251pgg.240.1564794305905; Fri, 02 Aug 2019 18:05:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564794305; cv=none; d=google.com; s=arc-20160816; b=s4lMogEbHZk6hpVpbIGsGpTqstjARmstJGz/D89tKsnE+CDYihgmfVUX0FrOOucf/N 3qy3khhz7whZzDlgZS9340gXyEGd58jZwoMB9uBHLBqDpf+kd2Qj0PHU4MwLdlWwx6q/ xu9vOx3TzAOUqSKUpgUOMEFty1L5y44syQh2r7+zXo2Kxxr8hnZly4gnN6OQD9E3Tib4 gVvcHX4f/+yP0698gjl3dCEZnQ7BzYYPH7hsybA+n+ausbrjKkOoWi43QtgmGMFxVVI4 WZL3bJ8ZsO4xu27dOQHejMR/LNxV51RueV6gaOC7zr78rC/z2qPY7ptb3fbMzBXq8+Uh 5zYA== 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=Xl94i5BEKpbg4tD9Mx5BgkcXJiB2bmQoljoaVsxItM4=; b=DlvCV/3zDMHQ2Y4VY1RIcYiPXIMJFLFISOpp6fYXOM0A0kPQbUKVwzwR8ND8Ytom+n z0CQiAwD54UjNFtT5BG/093FbPkgdzawVuTPjygcpY7Jt3XFQLAsBqHadgDtsauaw8Bn zUgPzlaoesviN2YkeRX5lLukOWegPl/BeRRsufEufwZ5vynK8LnP6jpDr2a/gmFQvVUo HGNgT0/cBYoAVuQ9LWTeq6PtsKFiaObT4ME/HK2+DSwLFP4tvq30S3KqszpSn+0LsTOX zpqwh4wj3n1L9XPCidmH01id7mB0okOn42GRpIbeVnbBClNQER9xdeKZ9PMVAzl2kJHU YTWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0+VgFaNa; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g13si39915564pfo.22.2019.08.02.18.04.49; Fri, 02 Aug 2019 18:05:05 -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=0+VgFaNa; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389474AbfHBNYE (ORCPT + 99 others); Fri, 2 Aug 2019 09:24:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:34438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394058AbfHBNXv (ORCPT ); Fri, 2 Aug 2019 09:23:51 -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 3CD142186A; Fri, 2 Aug 2019 13:23:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752230; bh=WAECSgdtL6q/gR8ajk0/uLwjM6p9wQm4rMV/NeVFqeY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0+VgFaNaGSJeeTBUIVaGMIzccwm9q19YtNQ2INQiVvg6tX322gD0uI8A81y6MmhKt JgbtHw52sdMRk+tOL+JimUqgBiFkQ57PSwbx4+B6nRpqBb0/CpgLr7RuMdq/K4WbN4 kok94EgAMA9TLcdcLJYqBkXMdqQjv+sdLewcKy/s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Charles Keepax , Vinod Koul , Takashi Iwai , Sasha Levin Subject: [PATCH AUTOSEL 4.19 25/42] ALSA: compress: Don't allow paritial drain operations on capture streams Date: Fri, 2 Aug 2019 09:22:45 -0400 Message-Id: <20190802132302.13537-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802132302.13537-1-sashal@kernel.org> References: <20190802132302.13537-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: Charles Keepax [ Upstream commit a70ab8a8645083f3700814e757f2940a88b7ef88 ] Partial drain and next track are intended for gapless playback and don't really have an obvious interpretation for a capture stream, so makes sense to not allow those operations on capture streams. Signed-off-by: Charles Keepax Acked-by: Vinod Koul Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/core/compress_offload.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 5e74f518bd598..9c1684f01aca0 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -835,6 +835,10 @@ static int snd_compr_next_track(struct snd_compr_stream *stream) if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING) return -EPERM; + /* next track doesn't have any meaning for capture streams */ + if (stream->direction == SND_COMPRESS_CAPTURE) + return -EPERM; + /* you can signal next track if this is intended to be a gapless stream * and current track metadata is set */ @@ -862,6 +866,10 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) break; } + /* partial drain doesn't have any meaning for capture streams */ + if (stream->direction == SND_COMPRESS_CAPTURE) + return -EPERM; + /* stream can be drained only when next track has been signalled */ if (stream->next_track == false) return -EPERM; -- 2.20.1