Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp170759ybp; Thu, 3 Oct 2019 11:48:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsmxpJstU4E0CuII+dnajS0KjEZpmXQb72jmR1yhuDoNZjkGNOvAnbk3S8zzdLBcRcoPFO X-Received: by 2002:aa7:d295:: with SMTP id w21mr11271215edq.302.1570128498861; Thu, 03 Oct 2019 11:48:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570128498; cv=none; d=google.com; s=arc-20160816; b=nZ22nTuoObVnif3snzxJLECYD0KwASjVLw3rNvzCQhXwaqVv0YmWcRfhlUVE8bYUpU tKE3oEZGFYYIYWBYMjTBj9qSBfT2PuakxWWAkKLa5JI2AnhWBbx8vJY4C5QMAFPnI1Jh A6H6QxTV6C+wTxJA00jbgnQMzoa7TYeMX/SdSJYLxDLdNwuqRgAgf3ebMT+77bLLkQna lhFN0d4QkOLKOUlDe9onWoDwT03Vv0+rzyvvbXS+IOnmOFbbm6iad+/axIzMVue9MMJa 2misU6jMDj2FKiIBtZve0EkWiUOFNaCVKlHB8gJXiGwIOI5ImSabGq3iSo2ec9FiCRRJ jyBw== 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=q9AU3tcxopKe02GncZuGSNaLw1NzW1RoRs6lWWVwsA4=; b=IJ7eejCSotyvi93mxHjE9ebID0N35lskmcjXVMCGorpkpYho1UVtk0/G1ahsEhBS/y hllf1VA/HZElZm0nY6CQMCu+Gxt7yCxyWmpUw7PYWsa5d0LNP2o7aGARpjGun8ttQeCw G8LcRG6GjPDBkgKICwSjC71gfsVBz8rdBPsj8GXYz3Z3PPS/umpFK1EAu/RGwAyu/4RT Zybcj7d+Jc9yghlfjTJmGtEJHefTWYeKNK2/91YYURLix01S3MvcqevCsLy+xYR0OE45 iEbGs21gZxac/+J8QR7M2Dh5UmdesUmgXrvOrdxCeHiGieOYOIqGDrrMP6NcIuKzSpFs bprQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kQueA1yz; 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 z19si1794689ejr.244.2019.10.03.11.47.53; Thu, 03 Oct 2019 11:48:18 -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=kQueA1yz; 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 S1731293AbfJCP6v (ORCPT + 99 others); Thu, 3 Oct 2019 11:58:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:41662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729062AbfJCP6s (ORCPT ); Thu, 3 Oct 2019 11:58:48 -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 7DC2A20700; Thu, 3 Oct 2019 15:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118327; bh=qOgqvqjCkUD8COe5UC9OHjXjf/iIdtSx/nJitqT3eqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kQueA1yz2fHGAm8NyGVp4K/tJmWvdnpNKHrBk/DzdrSMGQLjSJeHlyOc9xLpeKCt0 Ip/Y+34YwKxpW6gvknaPCMCHZb355qWOE0TrbmkB1yZkH9BLMmxyQ8lvmQtiSX2H5E HV+XBgHxSEaCUcuVDsQIm6T3iqMNVuOxyuZVl7Jk= 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 4.4 44/99] ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() Date: Thu, 3 Oct 2019 17:53:07 +0200 Message-Id: <20191003154316.732713960@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154252.297991283@linuxfoundation.org> References: <20191003154252.297991283@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 bf377dc192aa7..d33e02c317129 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c @@ -789,11 +789,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