Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1632550ybv; Fri, 21 Feb 2020 00:39:40 -0800 (PST) X-Google-Smtp-Source: APXvYqzNVghbgdcexfI5IYAZqRsJoMwUkGW8MGHUhoFatAy7TC51Y7qPi1khabccMf0o3PcGpZUi X-Received: by 2002:a54:4f16:: with SMTP id e22mr1095519oiy.170.1582274380676; Fri, 21 Feb 2020 00:39:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582274380; cv=none; d=google.com; s=arc-20160816; b=PwuIyH7m1+cIaRjsQ7FCg/5KEhMjQs/M1ISuXZJHRcpTBztcxYc1mKCSAbBgQh3r0X epXXWnBrwWo1PuVyaGcQbqycxQ/U0CXeLqBa6c0bFSUiQZ937J8TvhdwKUFM8Kq2AnoA 3AiyYDawQ/wT+PGjSdQ2Eo35kltXFuUklPGfGIzdAiGgsUvjHtxHI2Mmn06FFC23CxKm VuUGEBH9gaibVx8PMpf0mVKliZMn3HgXTXSDGn7luyohldFqedOVUrQfa8tsGgFVl1rs eslvPOqxEKJIChajQ/DQcuPg+QgDA6VuBQBVNjblDMVCjDC7Dxlms7mnr7x5r+DylwZZ /QuA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o7CShle2ds9NF59BKsSgg860hS6fZ/EzEeZLISgXvrg=; b=lC8dqir6xbk4bFmX0YwIHhvSCiyT/OofWKIv708waJM/BrkBduPg8Skta61qhhKtAn F6p7NMKJqMfLkadL4yP7W4ooUYqeDjPvfgeEP+4mUA4bze1dR1zKw1ypZ5LllBaD9WWu xwsWLdB38qGwYsiTUt/+5ZiqcTEMHkYnhC+x6vNX7LKLjkXYp1kHwWVtagpUnZgwfk8p 4CsByszCYvjKfh90E+tYqkNFnhm455XUdJ2sDfSZV68UIFGzqksPEazAf4W65ZoDY1in g6QCXjjTwwcV7Knnb9LyS4QxxXxK72ApP+OPxS/jcj7Mx/JGZ+1ZL1NHvn0hU878kz2m 4WlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="hMvXp/MQ"; 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 j71si464198oib.213.2020.02.21.00.39.27; Fri, 21 Feb 2020 00:39:40 -0800 (PST) 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="hMvXp/MQ"; 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 S1731331AbgBUICU (ORCPT + 99 others); Fri, 21 Feb 2020 03:02:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:34612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731312AbgBUICK (ORCPT ); Fri, 21 Feb 2020 03:02:10 -0500 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 E91772073A; Fri, 21 Feb 2020 08:02:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272130; bh=CqYiNBMlMWHKkp/lCav82O14317gOiqR2e73IbrS+zI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hMvXp/MQ56wr9rMQ6/mn9FE8GqbCsdPEAZh8wAVGuD6DHaR/zoUTHSSCeIFSUwycT vKG6FY+DAvAXh8dnTZh7YFCdd3XuKRGF6qjTwYTMTHRPdkkkK+s5bKfSkb1qGC8A0s lNtlHPO7e38HUhJs2aFVmkFI7BCqNGlYFvhihc7A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Sakamoto , Jaroslav Kysela , Takashi Iwai , Sasha Levin Subject: [PATCH 5.4 027/344] ALSA: ctl: allow TLV read operation for callback type of element in locked case Date: Fri, 21 Feb 2020 08:37:06 +0100 Message-Id: <20200221072351.630672854@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072349.335551332@linuxfoundation.org> References: <20200221072349.335551332@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Sakamoto [ Upstream commit d61fe22c2ae42d9fd76c34ef4224064cca4b04b0 ] A design of ALSA control core allows applications to execute three operations for TLV feature; read, write and command. Furthermore, it allows driver developers to process the operations by two ways; allocated array or callback function. In the former, read operation is just allowed, thus developers uses the latter when device driver supports variety of models or the target model is expected to dynamically change information stored in TLV container. The core also allows applications to lock any element so that the other applications can't perform write operation to the element for element value and TLV information. When the element is locked, write and command operation for TLV information are prohibited as well as element value. Any read operation should be allowed in the case. At present, when an element has callback function for TLV information, TLV read operation returns EPERM if the element is locked. On the other hand, the read operation is success when an element has allocated array for TLV information. In both cases, read operation is success for element value expectedly. This commit fixes the bug. This change can be backported to v4.14 kernel or later. Signed-off-by: Takashi Sakamoto Reviewed-by: Jaroslav Kysela Link: https://lore.kernel.org/r/20191223093347.15279-1-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/core/control.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/core/control.c b/sound/core/control.c index 7a4d8690ce41f..08ca7666e84cf 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1430,8 +1430,9 @@ static int call_tlv_handler(struct snd_ctl_file *file, int op_flag, if (kctl->tlv.c == NULL) return -ENXIO; - /* When locked, this is unavailable. */ - if (vd->owner != NULL && vd->owner != file) + /* Write and command operations are not allowed for locked element. */ + if (op_flag != SNDRV_CTL_TLV_OP_READ && + vd->owner != NULL && vd->owner != file) return -EPERM; return kctl->tlv.c(kctl, op_flag, size, buf); -- 2.20.1