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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 E0819C32750 for ; Fri, 2 Aug 2019 13:25:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA1E020644 for ; Fri, 2 Aug 2019 13:25:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752302; bh=RgQN4YF2CFXCe3Y6feEwt0FWqjUndpT+Z2gITf/3vH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ke0ScBwCE6gAun6BWi6t7vsGb2Rfs9mHgwOpkWV4v0nkIFaNMc3SKU7UznXd4wCD0 hIJjd0KpP6ctZ6DZRUF4JP+i6LxbWrDdOjYJ1SiZlxF6gtayhmXoZPXf99hXS7vQj/ YLb9ps+au4ycRywzgyiGKy9qrkMUeN/UF6YE0598= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394315AbfHBNZB (ORCPT ); Fri, 2 Aug 2019 09:25:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:35658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394292AbfHBNY4 (ORCPT ); Fri, 2 Aug 2019 09:24:56 -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 5AF0D20644; Fri, 2 Aug 2019 13:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752295; bh=RgQN4YF2CFXCe3Y6feEwt0FWqjUndpT+Z2gITf/3vH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lcIkFpvkiMdZpp0MaPSAnz2asstueOtRLGVbBxZDSwpumkHNp2j1NMQXtroHlwA+/ Fw++QRbtxxPPQD4cHHv1cVlszcW4QwIqZpMLZxozg4B7o3a19DtOh1+I0v3oi4gK/Y MGx6Oihek4P4O+SjP0HpB+MRIGk0ynCLbHzgPmeo= 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.14 17/30] ALSA: compress: Don't allow paritial drain operations on capture streams Date: Fri, 2 Aug 2019 09:24:09 -0400 Message-Id: <20190802132422.13963-17-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802132422.13963-1-sashal@kernel.org> References: <20190802132422.13963-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 1538fbc7562b8..b4f1536b17cb5 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