Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp932762ybt; Wed, 17 Jun 2020 18:16:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXcAXmbft80AC2509ekX6OydrN3FD5Jj4jJAcC5zKacZj7OQ3trHhFLmMGbbEzyEaE90sH X-Received: by 2002:a50:e881:: with SMTP id f1mr1746284edn.98.1592442979441; Wed, 17 Jun 2020 18:16:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442979; cv=none; d=google.com; s=arc-20160816; b=U4inU5nHWTM1UuY12pZCGMMjzODGIFX97ZLNwpEWIrD6SCT0kJYICBNgbXQkwKrjgB LynZiMbgkIu4/kHx/GUxQ6RMwRxKEayP0Ii+Lr1ygsiSpctULB2trKTxO/PrfCqSzr7j 6nj2heK+HnJw7kQRI6Gnyc8gr1/bzUlB1ZtNNjepQ3QT0gNV9QpBZx7updm2lXbJbveP 3cOpZ9RaXUaFWf/jfi7RWlxsyCMFM1eJVdq/PK55xBu6rWU2jeH+cyXEAzaZiOe1fIBQ CUCc2n+iazeK8COnE6avmON8LAMaY8byJ4r0mJPnd3AEUbigMHcUwwHKda/T8BVqAh20 g1WA== 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=G8pVpZnEAvgCadqunHqBkNMSj4Q2qkfoF93JRZ7V79I=; b=vmBlxQB6/fo5g6X1cUro8TrWpQa8u38z6zXI+hq5a/mnq5vMW96oNDlXswe+Dg23dj 4GuIuDl86PD89JCug/Kf8h3pH1rqzsBRknxLZzSTkk1a/Tutnl2r7dbzgnw3MoafF9tP Olf0YovL+m493DGfxSvOer9RTevxOVX+t883VYSA4lOKa83w/hDQTJ2KUjDqrpILe6V0 mhWqndkXR8A4YqwnltRJbm8ZIPaRymgLCFL4dZRVzesTNUQkJc35KJs7bLDegYnpizih ACSB8e5RcgLAwdr+5HgEQLVNrSy+DuRPw0TYQMijH8jLtlnAOcFuNm04NeuqE+1Re8mv cSuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c+hCTKDG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id o19si965476eja.256.2020.06.17.18.15.56; Wed, 17 Jun 2020 18:16:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c+hCTKDG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1728691AbgFRBN6 (ORCPT + 99 others); Wed, 17 Jun 2020 21:13:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:41656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728995AbgFRBMu (ORCPT ); Wed, 17 Jun 2020 21:12:50 -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 22A3321924; Thu, 18 Jun 2020 01:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442769; bh=/wUskEBPkDlGuTw0FJYcgRRsQyOeMwrGcwZ4cte4Wio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c+hCTKDGJxy9oH0L/DBpdkf3BsnF9vUfgayR6mawzI+17hZ38ECHlvcyzZwcyEGAc dphGmdWmCfcdINv5UQznF2umiOJBaullXBymIooZXzvAy5przLiRbyjCArG/ofRWZt +6A4Wgy7JE3mcwM6ulwTl/FHuDVlb8cSrNWmd1qw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pierre-Louis Bossart , Guennadi Liakhovetski , Rander Wang , Oder Chiou , Shuming Fan , Jack Yu , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.7 217/388] ASoC: codecs: rt*-sdw: fix memory leak in set_sdw_stream() Date: Wed, 17 Jun 2020 21:05:14 -0400 Message-Id: <20200618010805.600873-217-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-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: Pierre-Louis Bossart [ Upstream commit 07b542fe831cbefce163ad1b3aa7292c8a6332b8 ] Now that the sdw_stream is allocated in machine driver, set_sdw_stream() is also called with a NULL argument during the dailink shutdown. In this case, the drivers should not allocate any memory, and just return. Detected with KASAN/kmemleak. Signed-off-by: Pierre-Louis Bossart Reviewed-by: Guennadi Liakhovetski Reviewed-by: Rander Wang Cc: Oder Chiou Cc: Shuming Fan Cc: Jack Yu Link: https://lore.kernel.org/r/20200515211531.11416-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt1308-sdw.c | 3 +++ sound/soc/codecs/rt5682.c | 3 +++ sound/soc/codecs/rt700.c | 3 +++ sound/soc/codecs/rt711.c | 3 +++ sound/soc/codecs/rt715.c | 3 +++ 5 files changed, 15 insertions(+) diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c index a5a7e46de246..a7f45191364d 100644 --- a/sound/soc/codecs/rt1308-sdw.c +++ b/sound/soc/codecs/rt1308-sdw.c @@ -482,6 +482,9 @@ static int rt1308_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, { struct sdw_stream_data *stream; + if (!sdw_stream) + return 0; + stream = kzalloc(sizeof(*stream), GFP_KERNEL); if (!stream) return -ENOMEM; diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index d36f560ad7a8..c4892af14850 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -2958,6 +2958,9 @@ static int rt5682_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, { struct sdw_stream_data *stream; + if (!sdw_stream) + return 0; + stream = kzalloc(sizeof(*stream), GFP_KERNEL); if (!stream) return -ENOMEM; diff --git a/sound/soc/codecs/rt700.c b/sound/soc/codecs/rt700.c index ff68f0e4f629..687ac2153666 100644 --- a/sound/soc/codecs/rt700.c +++ b/sound/soc/codecs/rt700.c @@ -860,6 +860,9 @@ static int rt700_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, { struct sdw_stream_data *stream; + if (!sdw_stream) + return 0; + stream = kzalloc(sizeof(*stream), GFP_KERNEL); if (!stream) return -ENOMEM; diff --git a/sound/soc/codecs/rt711.c b/sound/soc/codecs/rt711.c index 2daed7692a3b..65b59dbfb43c 100644 --- a/sound/soc/codecs/rt711.c +++ b/sound/soc/codecs/rt711.c @@ -906,6 +906,9 @@ static int rt711_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, { struct sdw_stream_data *stream; + if (!sdw_stream) + return 0; + stream = kzalloc(sizeof(*stream), GFP_KERNEL); if (!stream) return -ENOMEM; diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index 2cbc57b16b13..099c8bd20006 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -530,6 +530,9 @@ static int rt715_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, struct sdw_stream_data *stream; + if (!sdw_stream) + return 0; + stream = kzalloc(sizeof(*stream), GFP_KERNEL); if (!stream) return -ENOMEM; -- 2.25.1