Received: by 10.223.185.116 with SMTP id b49csp767570wrg; Wed, 21 Feb 2018 06:38:24 -0800 (PST) X-Google-Smtp-Source: AH8x226wS//CwMRLt4ZRndyYECr+h3aiRTB0e3vBaMXv7DsHcQZHoyqLvcDBo22NYTYTXvd/zrgD X-Received: by 2002:a17:902:8b85:: with SMTP id ay5-v6mr3409807plb.329.1519223904360; Wed, 21 Feb 2018 06:38:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519223904; cv=none; d=google.com; s=arc-20160816; b=nYN7R3TF6/VI/KeBrwehfi8fAPYH5ZfPzxx10CzLM5VxAT5tBEja99BmaLEUXVw2V/ tINzvYgcG2myCote3zYGMVB1QNf93IfSRNgOmoYT6vtlLdyX2v+jkyW+GAmbCiVmKKrc 6J4GMAU17UBPmO/03gw6Dukvbz6jC1qm8sf+oWCXjyWT20K4opk4bqefNsmIp0edcNMb nzcvpt4tzrmpXMaMWovpPkHs/Qs29SxORcjQ63auXwyF4WDT5wHR2Zn0xQ6xUnVk46KB Gs77IN2v9J7c3ZKCSTgAC7ITrU0+riioz2pzbkyOGfGw7itI/VRjBiX3vYF4j1xFm7rL eP8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=MVUJnp/0qR8oWDPClorGsIBmx1IbsGVmnKnJ9qW6ZOU=; b=sM6Vi04YH26yP4XsdA/YB0LWms52HDWTnHoT5u9Rdl5V2myozNQLidEj+SlcMhrF3Q dkNhv4B6zMqs/FQdkB7MLSuKulNrsEPiLHlLmJJrjkd/MT+9kANSBgioh8O/UoMEqNU7 7uucJtXyzLuWrzMAe0QCrBT58zNCOsRmqXP6p44nLnAuElDA4RT+aSdru9/+LY+k7vyV Q3nbCb7+aPWpscYa0ut7nhzmZzSAVc71K7ViucWDvPGz1anW2Ao3GW9VpdpZxZvX4zaN X2/sNXU9xvROFURtffkYPsugVMzad7yXoWdxmDHhchJBZBf4zIyULH7xU4yEUNO0TjwG 22vQ== ARC-Authentication-Results: i=1; mx.google.com; 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 33-v6si4198825ply.512.2018.02.21.06.38.07; Wed, 21 Feb 2018 06:38:24 -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; 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 S1754550AbeBUOhI (ORCPT + 99 others); Wed, 21 Feb 2018 09:37:08 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:34332 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934200AbeBUMzH (ORCPT ); Wed, 21 Feb 2018 07:55:07 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id A81F11130; Wed, 21 Feb 2018 12:55:06 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kirill Marinushkin , Takashi Iwai Subject: [PATCH 4.9 26/77] ALSA: usb-audio: Fix UAC2 get_ctl request with a RANGE attribute Date: Wed, 21 Feb 2018 13:48:35 +0100 Message-Id: <20180221124433.290655329@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180221124432.172390020@linuxfoundation.org> References: <20180221124432.172390020@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kirill Marinushkin commit 447cae58cecd69392b74a4a42cd0ab9cabd816af upstream. The layout of the UAC2 Control request and response varies depending on the request type. With the current implementation, only the Layout 2 Parameter Block (with the 2-byte sized RANGE attribute) is handled properly. For the Control requests with the 1-byte sized RANGE attribute (Bass Control, Mid Control, Tremble Control), the response is parsed incorrectly. This commit: * fixes the wLength field value in the request * fixes parsing the range values from the response Fixes: 23caaf19b11e ("ALSA: usb-mixer: Add support for Audio Class v2.0") Signed-off-by: Kirill Marinushkin Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/mixer.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -344,17 +344,20 @@ static int get_ctl_value_v2(struct usb_m int validx, int *value_ret) { struct snd_usb_audio *chip = cval->head.mixer->chip; - unsigned char buf[4 + 3 * sizeof(__u32)]; /* enough space for one range */ + /* enough space for one range */ + unsigned char buf[sizeof(__u16) + 3 * sizeof(__u32)]; unsigned char *val; - int idx = 0, ret, size; + int idx = 0, ret, val_size, size; __u8 bRequest; + val_size = uac2_ctl_value_size(cval->val_type); + if (request == UAC_GET_CUR) { bRequest = UAC2_CS_CUR; - size = uac2_ctl_value_size(cval->val_type); + size = val_size; } else { bRequest = UAC2_CS_RANGE; - size = sizeof(buf); + size = sizeof(__u16) + 3 * val_size; } memset(buf, 0, sizeof(buf)); @@ -387,16 +390,17 @@ error: val = buf + sizeof(__u16); break; case UAC_GET_MAX: - val = buf + sizeof(__u16) * 2; + val = buf + sizeof(__u16) + val_size; break; case UAC_GET_RES: - val = buf + sizeof(__u16) * 3; + val = buf + sizeof(__u16) + val_size * 2; break; default: return -EINVAL; } - *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(val, sizeof(__u16))); + *value_ret = convert_signed_value(cval, + snd_usb_combine_bytes(val, val_size)); return 0; }