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.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 04E09C43387 for ; Fri, 11 Jan 2019 14:42:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C54A421848 for ; Fri, 11 Jan 2019 14:42:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217738; bh=hIyh7yJBlo1giRYT7MV36POdXSixKf/3ALszA812lPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kxQtpMS1TzgZtxaL4+BmsV3Fzqk7ltl1M7BqQBcgwYJu7c1W2uCc+jiMzJJKHHn+G MzWFHdUza19SZa7LIIsGevS9NnF2MpfmKeLlkTnXovQmaArKcEkgnkCBLhlbC+OpZn aEHNQK+l5KLC+di6bLSF12FVq5pD9AHoJQMToeb0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404136AbfAKOmS (ORCPT ); Fri, 11 Jan 2019 09:42:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:35004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403849AbfAKOmO (ORCPT ); Fri, 11 Jan 2019 09:42:14 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 319AE2063F; Fri, 11 Jan 2019 14:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217733; bh=hIyh7yJBlo1giRYT7MV36POdXSixKf/3ALszA812lPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vc9ALAtgVtSd6sEygvtIxUy9acjhDahrWVHnpSTrwh7kFlZcCwrIx0t3BRRv3z7Tt 3JkKouWVNOZuCHOJia485woZWSPbeZn8NeM3RWJJKMWLoVbMtS9l2ZJAJPRtcnpP9s /iCYr+SqWQEXHe5o4xVNo48WgnPkh3k+8B70/SuQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hui Peng , Takashi Iwai Subject: [PATCH 4.20 21/65] ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks Date: Fri, 11 Jan 2019 15:15:07 +0100 Message-Id: <20190111131059.341067829@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131055.331350141@linuxfoundation.org> References: <20190111131055.331350141@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hui Peng commit cbb2ebf70daf7f7d97d3811a2ff8e39655b8c184 upstream. In `create_composite_quirk`, the terminating condition of for loops is `quirk->ifnum < 0`. So any composite quirks should end with `struct snd_usb_audio_quirk` object with ifnum < 0. for (quirk = quirk_comp->data; quirk->ifnum >= 0; ++quirk) { ..... } the data field of Bower's & Wilkins PX headphones usb device device quirks do not end with {.ifnum = -1}, wihch may result in out-of-bound read. This Patch fix the bug by adding an ending quirk object. Fixes: 240a8af929c7 ("ALSA: usb-audio: Add a quirck for B&W PX headphones") Signed-off-by: Hui Peng Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/quirks-table.h | 6 ++++++ 1 file changed, 6 insertions(+) --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3326,6 +3326,9 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge } } }, + { + .ifnum = -1 + }, } } }, @@ -3369,6 +3372,9 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge } } }, + { + .ifnum = -1 + }, } } },