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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 1DC70C432C3 for ; Tue, 19 Nov 2019 05:21:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6BD522317 for ; Tue, 19 Nov 2019 05:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574140871; bh=JMVPXSymgjp8EVzS/aRQ37T9s+CPGvDksnU483LFt64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t2QxKTUsunPQzS9WmKLz6VDXa14ppNqfAfB2vHvMgRLguEgWtDugHOIrWIOqTOdR/ XGO3NyH6Fz2prpF+5amRpajvLrTfLhYsFJuKVroUkeQ8oe0YgaT3SMWueDRXXtOlDn rLUu6Dspxn38qzs7SEunYROqvq8p9HmvKZdIoFBQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727200AbfKSFVJ (ORCPT ); Tue, 19 Nov 2019 00:21:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:35776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727184AbfKSFVI (ORCPT ); Tue, 19 Nov 2019 00:21:08 -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 59B3C22319; Tue, 19 Nov 2019 05:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574140867; bh=JMVPXSymgjp8EVzS/aRQ37T9s+CPGvDksnU483LFt64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JCsGCWIrcSey27RWPV/AiA+Wf+jaxQrk+21a0eO/wsoYdRCmG+/66r9Hh+as9u643 UqOE3a8cUYyz2Saq/JklariLy9pzJDAgzdyadGKCew3o6iAHO4D5d+/WxYlb6IGYxb Zmx7y9QCT0+gT75q2zHBnK28j7P1wCZOlhqPcfJ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai , syzbot+abe1ab7afc62c6bb6377@syzkaller.appspotmail.com Subject: [PATCH 5.3 14/48] ALSA: usb-audio: Fix missing error check at mixer resolution test Date: Tue, 19 Nov 2019 06:19:34 +0100 Message-Id: <20191119051000.715025711@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119050946.745015350@linuxfoundation.org> References: <20191119050946.745015350@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Takashi Iwai commit 167beb1756791e0806365a3f86a0da10d7a327ee upstream. A check of the return value from get_cur_mix_raw() is missing at the resolution test code in get_min_max_with_quirks(), which may leave the variable untouched, leading to a random uninitialized value, as detected by syzkaller fuzzer. Add the missing return error check for fixing that. Reported-and-tested-by: syzbot+abe1ab7afc62c6bb6377@syzkaller.appspotmail.com Cc: Link: https://lore.kernel.org/r/20191109181658.30368-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/mixer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1229,7 +1229,8 @@ static int get_min_max_with_quirks(struc if (cval->min + cval->res < cval->max) { int last_valid_res = cval->res; int saved, test, check; - get_cur_mix_raw(cval, minchn, &saved); + if (get_cur_mix_raw(cval, minchn, &saved) < 0) + goto no_res_check; for (;;) { test = saved; if (test < cval->max) @@ -1249,6 +1250,7 @@ static int get_min_max_with_quirks(struc snd_usb_set_cur_mix_value(cval, minchn, 0, saved); } +no_res_check: cval->initialized = 1; }