Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp774478ybn; Tue, 24 Sep 2019 09:17:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqy0V49terpRVBDVfToZtcVI0Dpr+rklz6OS02plLRzytSBfatdJxcBXtn7xuT2lv8C6Q6E2 X-Received: by 2002:a17:907:20a2:: with SMTP id pw2mr3181292ejb.163.1569341847421; Tue, 24 Sep 2019 09:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569341847; cv=none; d=google.com; s=arc-20160816; b=UfbmsilEcJEAjOgnl1EOOJnseSPmztcd5NDs+WmmXAc7mRTlo2dPVIJzAiuLtscbvS c4zq4lBOHffjVupZWgtMvKpSfsjaZkDl98FI/ShdBZ8vxluXKa9oLpdSbM8DbK6Z70sd VxLmBSohg25dL2GXvwJ52iwlrj/+KsOPSdEajGBwMIznoVBySr1QevY9LMu3mefwiF0S FRqDN+Te3Q2idcdoecnT5lQ2y0yFuufKnEQDNyqCj/Bnv4nv9VZzBjumVDSdT454BgQY QcWYQqLt51fmS0xxaSRUrVzSiN1Ygr8fbuhdrU0xgaU0DRVeWIV2lM8IZAxDaFBQlVye RUxg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X88+4DnV5tRFukrSSgMeb097xu3jXO8FlhK/d+43ifQ=; b=Fy/BMAREGPE5kBKppry52L1nGAJnF+MuqDZeQAmBGwTC9b28UtPmFYhVQHJr2Ep0SW 2/5n1zBSirv8bl45GGgF+3q8aeIN4dCbwML4pT1h4wFHc5kBE/ioluTGU0DbJGyrV9Fe mroU9OrCLM2oZI6a5Cbr3H5MPCwtAY5MX7ZkeZsXxp5izZt0u6SnSAHht4D1rD7b8X6p ao48/oLuBgRDa47+L0Jx44KPXbE7R6b8v4+omaclX6LCvqaCA3sWuqvFfT1iYyJKCr9C Hon3nKilLJtvRs7XYLo9V81n19A27iJfQsfB+quLqfPoSiUfzjXTCz3MSYDgipNJSbWr sULQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TZYyrPPl; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x20si1146255ejb.393.2019.09.24.09.17.01; Tue, 24 Sep 2019 09:17:27 -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=TZYyrPPl; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439295AbfIVTin (ORCPT + 99 others); Sun, 22 Sep 2019 15:38:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:40996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389154AbfIVSpV (ORCPT ); Sun, 22 Sep 2019 14:45:21 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6AF4C21907; Sun, 22 Sep 2019 18:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177921; bh=IW9B/HeSgNw2BYZ4ZZx2Ue6CPKz5wPi/K6VoRd80Rnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TZYyrPPlWvcy1QULguYW7UkZdwARt0iJiDep9MmC4sNnc9/yycF0NVu7xwPCNgGhJ svZ7ReAGU2sBCu8jCf5UDeo5yLxCXfvEazWRK9utt11gK9jF3rVaPAX81LkhiGqkQ1 xbaidI6wRBkdSaZ9efrYmrzkjleAzcWxsolyp8fM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jia-Ju Bai , Takashi Iwai , Sasha Levin Subject: [PATCH AUTOSEL 5.3 033/203] ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() Date: Sun, 22 Sep 2019 14:40:59 -0400 Message-Id: <20190922184350.30563-33-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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