Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp98585ybp; Thu, 3 Oct 2019 10:43:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyRU0B/xHVvtu59C6NAWxma6aF36ET+ClKpsMzSYC4AW2LjejMRkNpzA9jddgJX300JdVr6 X-Received: by 2002:a50:9250:: with SMTP id j16mr10958419eda.160.1570124634296; Thu, 03 Oct 2019 10:43:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570124634; cv=none; d=google.com; s=arc-20160816; b=rwDtGdO3v1Q35lyCNnXd/7kJc44wq010N6UIa2RYLTlW6b3RJBr/7l2tJHVED+VexH u2FABB2HmEyzA2INyf2opN+IpPdAyzhaY2IxPLfpnoc0uTmbKDps5w35yVn4BRyKeU2s t+UBwDxlpup1XnTlBCI8ugYytHSvaAxsQ7rgCxbP4+Bno5AgrWeyRBKZFL5Mzphvmt9F UfWl7nEgXZNV894ljE9msnWlTS9tocKq0qMf+bqvpX5ygqN3ynF3+3dXG+3VSQHhxziU 96VrklkSuWeO2NDSTGGCcq6u4ukq5xOwSZLZHsMpoHH7bR6YV5P+8DQTpcYCz1+BxWzI 8wZg== 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=1BPS5awSLD6jJYqZLN6RF7yeglFLLG/laKyfQg/lOmE=; b=GoymIf5XVbg9mDQaNPMx4Qe9/qlOxcZiFmoJ03RrA6mOuvE4uJ/M+rEFSfnAW/iHub 8esS6xcCEkC/s6G7i43tN1IAJ7xky/lt1GkG4yKHGiRvO20x/J17joXNgxSOcIJQByv0 X1IP0jBQ/wtjvNEKVhePgRzWkjYhO03zE8EGAZABm/khukbjLzDMROfsGDekBNPHByNV AtziuE4qzaw6+OSYm2H+ER3LEHoY8jPbgALqDUJpQSBVHJxpiXlN/XaK4sIpMTttLVv6 jo30kriuNmkcxK7ytaYWUwCmx0gnTT6TDLm+IbMCQqYD8RzuIcEhmSvRAZ7N6yYpjkoi NjWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="J4/zKM4Y"; 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 hk1si419012ejb.408.2019.10.03.10.43.29; Thu, 03 Oct 2019 10:43:54 -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="J4/zKM4Y"; 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 S1729103AbfJCQQ1 (ORCPT + 99 others); Thu, 3 Oct 2019 12:16:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:41276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388066AbfJCQQW (ORCPT ); Thu, 3 Oct 2019 12:16:22 -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 23D8420700; Thu, 3 Oct 2019 16:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570119381; bh=BTVu3XXbsk3gJC2IHgYaGgyWzk3k3TJ6+9Fx/meRnv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J4/zKM4YYDYZooOPZ4PB5rLeeb1TxJHTjLmMBB2S4cL08Lfj3xLRJlaYex0Rz57XV KtRLETBe5PDbt/+P8E+ZCFViBy7XheFZ/VdqeFG2fNDtsdASnXvyjIL7ZwiRX0F+dA G5zbNhGMLDcIpt9PLASsSDvtJKYAlzKKCPncRF8o= 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.19 045/211] ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() Date: Thu, 3 Oct 2019 17:51:51 +0200 Message-Id: <20191003154458.327220310@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154447.010950442@linuxfoundation.org> References: <20191003154447.010950442@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 7f2761a2e7c8c..971197c34fcef 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