Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp71008ybp; Thu, 3 Oct 2019 10:18:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqx/ZyPHfV4vBi6MXqExlq8k3F/L3j0O04wL6CFks4T7pN0b3R+LxtjkayitBLw+gP9uhfM5 X-Received: by 2002:a50:91d8:: with SMTP id h24mr10553115eda.61.1570123122185; Thu, 03 Oct 2019 10:18:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570123122; cv=none; d=google.com; s=arc-20160816; b=IuIHFNqDNX9r/8kWJCt3aPzMFxUF/JoK3APDFO0qVWrb2I2yF/Bh3gfrC9hJhepwgb Fd30AuWKafrv3AoSx3EhTZAGsWg9v1veTd8Rq/WXUKdn2k22nuPiuYv5bkGcZe1Ufd9y OaD2qRRebgccncnEE4M9Zb2WQIfZpINKqkfybEpCUj01s9o3QmnBZxBiRmiTI8e9JBEu f60LBAX8geihIf3jDj/Q58WCB7qEKTQhQIfxd8fTisv+PwcTLSQXaC0O0Ddbnh/T9RPV JYTE2r8jQ4hT/Hg/FVgMsXHQgCOe3V9mlHiCc7CQXmrFEMQFiU6vjr3SKcs97HWVbI4D 6VOA== 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=X88+4DnV5tRFukrSSgMeb097xu3jXO8FlhK/d+43ifQ=; b=GkKWnZ43WJxbOt91tMaB32yrMd6pPCLNdHsyRmLoNhxlQX+/QCrZ6r/lJ8U4aolc1D YIRY1grqq5a4vAVBsBl2fQ28hNsuFCRRNk4afeTLlq3eWO9Iu3mFErrI1finZPHSP4hY W7vUDkSzZPiKVGDTRto21hbswr1OZpKoIuFzzl09RlFtZlwILKCD79o2u+6dfotGGaMy wCZNWccuBhvsj7eGb4q1LHx8MRHSAIs6icmYSOnnvA+gueq1EOGgO2RLqNMX79ha6AjR THySY5Gz9kEK/4kJWJWHOX5xb4AQ6JjswcwKSyNeuHK9pw1WZYSgX1vTf9dgb6yMuO3i fw6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SBfakHuA; 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 m20si1913007eds.363.2019.10.03.10.18.17; Thu, 03 Oct 2019 10:18:42 -0700 (PDT) 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=SBfakHuA; 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 S2391146AbfJCQ0v (ORCPT + 99 others); Thu, 3 Oct 2019 12:26:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:58210 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391130AbfJCQ0r (ORCPT ); Thu, 3 Oct 2019 12:26:47 -0400 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 5068121783; Thu, 3 Oct 2019 16:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120006; bh=IW9B/HeSgNw2BYZ4ZZx2Ue6CPKz5wPi/K6VoRd80Rnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SBfakHuA/ggr4yROi4ABIk7xXNMEaCvS1KdpGUJ7f4NdApIRBeFS0SU1ebqYHYT/l T4EkTO2nGDEW6Nz1BBgQKozA5ojBw9GGLuLW2YsGEC//gKjNmsoORbcJ8UT4I3c3sv gGDtGIM6cUQhtdZ05RZe7MyoPmYOIxRGV56zfGVI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jia-Ju Bai , Takashi Iwai , Sasha Levin Subject: [PATCH 5.2 062/313] ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() Date: Thu, 3 Oct 2019 17:50:40 +0200 Message-Id: <20191003154539.088797687@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@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: Jia-Ju Bai [ Upstream commit 2127c01b7f63b06a21559f56a8c81a3c6535bd1a ] In build_adc_controls(), there is an if statement on line 773 to check whether ak->adc_info is NULL: if (! ak->adc_info || ! ak->adc_info[mixer_ch].switch_name) When ak->adc_info is NULL, it is used on line 792: knew.name = ak->adc_info[mixer_ch].selector_name; Thus, a possible null-pointer dereference may occur. To fix this bug, referring to lines 773 and 774, ak->adc_info and ak->adc_info[mixer_ch].selector_name are checked before being used. This bug is found by a static analysis tool STCheck written by us. Signed-off-by: Jia-Ju Bai Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/i2c/other/ak4xxx-adda.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index 5f59316f982ae..7d15093844b92 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c @@ -775,11 +775,12 @@ static int build_adc_controls(struct snd_akm4xxx *ak) return err; memset(&knew, 0, sizeof(knew)); - knew.name = ak->adc_info[mixer_ch].selector_name; - if (!knew.name) { + if (!ak->adc_info || + !ak->adc_info[mixer_ch].selector_name) { knew.name = "Capture Channel"; knew.index = mixer_ch + ak->idx_offset * 2; - } + } else + knew.name = ak->adc_info[mixer_ch].selector_name; knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER; knew.info = ak4xxx_capture_source_info; -- 2.20.1