From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.51 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794815554; b=fual4fet7HXeEJZWjZzanuIg24b/ZSn3y/OQgndcBBHCKPZkoNWb+QJW85jf+yugN398 Oy4XzV1OvRY7wxqSEx7T0+KfPpWZ+HVPya9v+7TdpGlcJbNRzGnihP+Ax+EnRaKNzM4it xQ5oeOyJdU5A9NPWER0H9YvtbceiJ9Ihl8j1y7u7adgDWFfx+V9JQda2J1e7peTYGTb/D ustmnMT9O55kLaw6VLj5PI0xFG3nv1HkJunS9qbXwWk+HPTGZM8Gh3rqFJXEbUMgm+jhu TBD/hkZO+FnpSp/c2ZPLgvBS5Zel2DFpE/f3uB3SyBkDwP+2QrgLmZX+F3MoG9prCxg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794815554; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: Message-ID:Date:MIME-Version:User-Agent:From:Reply-To:Subject:To:Cc: References:Content-Language:Autocrypt:Organization:In-Reply-To: Content-Type:Content-Transfer-Encoding; bh=8hZ6vhqouVFsnxOc8QRDh5YUzqwcZIN12aUhWdhK9B4=; b=gzW1b2gdst//uY7DGI7DjkGJnashcbGRG7hYbvS9S7mOhZsKTT6u+Xh0qLRpeMF9jdo4 iFYErIFKRIO4w0C1qJgUAAtmadpDfqo82InK1KXVt6gnv1lBUVkBAsbkvdzbPNmHqUegH VyTF/SJAnw71zuTPID7UzI3L2RUs8mqd366KigypuLH7PgrtMRutUBeMQ0PEgBCVmvbBf aVxBDzfNjzduFD2e9VBRCWPQGs7RHCMxWbA4r9QjPCuDEYaHPn51hYQBRD8t3krWziaV2 peVnaIU7CKGrGIoojvG5nft96UOVzOqpgZ3EVBW0CL31lTGQXBaNs7OWbWoAkroreGA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b="vM/Sc6s+"; arc=none smtp.remote-ip=209.85.221.51 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30A16606A31C for ; Mon, 16 Nov 2026 07:52:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 30A16606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=vM/Sc6s+ Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-491f34b4e0fso1232845f8f.2 for ; Sun, 15 Nov 2026 23:52:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1794815552; x=1795420352; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:organization :autocrypt:content-language:references:cc:to:subject:reply-to:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8hZ6vhqouVFsnxOc8QRDh5YUzqwcZIN12aUhWdhK9B4=; b=vM/Sc6s+ky4vHUcYVwcvFip+Q2nJ2tuPKtkjDpLVGxjLAupW2Y8io48F4e1XhkohsP Wa3TxAhYO2moSnf0918SGO/BbmOwgBENJyGlEuVleVKIhGVGbF5fhmxR+xQNXj/ZIAQJ jbm9FsuJrzru5hmoOTk/uPSzDDV1ItiKeKiccX11PJN9/+MqDgsxiM96sLw7gCs7+8d3 eXd+RFWDEIA5g7333pIn3Tp/1kVsX2XIYx9qUMo6rCmIko84lyjc9lDyavCVp2q2/qVw icMoc+P3dr3c3DyjRsAGvq+PDFCMtHdW15j8LTsj8O38Lqz2DkY9BnRcb2Rf5b7h/8Ty pgtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794815552; x=1795420352; h=content-transfer-encoding:content-type:in-reply-to:organization :autocrypt:content-language:references:cc:to:subject:reply-to:from :user-agent:mime-version:date:message-id:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to:content-type; bh=8hZ6vhqouVFsnxOc8QRDh5YUzqwcZIN12aUhWdhK9B4=; b=mavxDF8sY8he0pyLYhwILul7kZs2BmxFEmwXNX46Wy+nQduP70Fepv+v77pGz4lo7x 85CPQt/v2vWJOfCge1998YD9Nej8qZH87L5R0m3vSbY1mT00RWkVorGp4Q0CXWXKmH3r GoZAEltcF8TYJvFvm75xYINnFptSwIxwhg+qwgPdDGLUXlyhiqobOPmRmXa35izRPNRh UAg4P4fYBNaLViXk2pSh+wzIOnFsnurBNIbDIymCJPRQKYzBllOwj/76zpDCR5XOzRyk H3b/oH0xrp0abrvUocw0F3CGnXE8hlF4cmYw0DjeVfM2P1aTszwywIElB8KoWP+x5D3l rbRg== X-Forwarded-Encrypted: i=1; AL+hErEjZVq3iM+MqzWt5awWW7+0Li9HGM32r1qLknH/x8343ii/oP8Q/ogY6qOseMAJgfA81P9CpaJ1NPyN@vger.kernel.org X-Gm-Message-State: APuU4Z/sQA8b0ClD93pEc8NgB9IMyDI/QmhILtyb+37ARp6HWPjbG192 tjIJnRFbrZ/LGjiQNkOfWvRgkT/ooYJDstbNZp/zDPQvYAMR1vKoqDmHx8BNXHm3zKQ= X-Gm-Gg: AYBFou0Et7Xy96fwXf15Z9tm23NPopLNj5ZJVhXhC9Gbz9m1iHPzHE16C+uP87hHEkY EXB9ee8ulDe/k5JQCw8M+TVGLYK4rHwKYt9FswkinrLaDiRIdvBFhlvfjsOO3LmWc6Mhyju5Rvu 33GW1cRRuKhiq5uX/TOMrNqkWwfZGJSDD+so+U+BZecP+S9jfI1iQwYg7b6IFCr5nt2ak3tRu7d HuBEhmxe6MIu7vTTqvlUPLMUNijMkZRfyc5Bnfnv13eDFRYWKoROrJ5C1zrWg4w9inhvOd9mHHR Yr5rpiAr8JupJv+H/OEtdHWeruQ/AgjGhHMnz04E2je8QoXJW7EwJVlgt1tO0JXJf7g956XVmws +e+wBmAcc+aN/Z2QDpqv9uRpJJhqT8d7YWi3wIpwuTVpZPnJhF927pmrGJE/bfn9NNjayr7OVmJ Amle+RWdUOqXWHFCEmgU8mdle2jYx6jCM8dmas3r9pujY1lXH4eKaPD+rGOqfaGKuKR24YVnIsn I0D6adkke3d5+Uwnu6mJWDemPS0xx7TYNOzY8Cb+U1Qt4DB/mQYkKwj+YiZaWA+VjqR4ZCsr7au 7BkZZvaZjmQjWL3CzwVMfMgY4tu7RspuK9IfI1fzZ1KCOb5StkthG9dCSGXp5NR5GC03QoUaO08 5nqDgIXUv X-Received: by 2002:a05:600c:3b93:b0:4bb:6f67:ca0b with SMTP id 5b1f17b1804b1-4bb6f67caf0mr75284045e9.29.1794815510779; Sun, 15 Nov 2026 23:51:50 -0800 (PST) Received: from ?IPV6:2a01:e0a:106d:1080:575d:8fcf:e30d:5aed? ([2a01:e0a:106d:1080:575d:8fcf:e30d:5aed]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4bb732a2a9csm36296965e9.3.2026.11.15.23.51.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 15 Nov 2026 23:51:50 -0800 (PST) Message-ID: <56275bdd-e71a-4f59-8933-6a0752268fef@linaro.org> Date: Mon, 16 Nov 2026 08:51:49 +0100 X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Neil Armstrong Reply-To: Neil Armstrong Subject: Re: [PATCH RFC 13/23] ASoC: qcom: lpass: support mapping I2S ports to multiple LPAIFs To: sashiko-reviews@lists.linux.dev Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org, robh@kernel.org, conor+dt@kernel.org References: <20261113-topic-sm8650-el2-v1-0-5183f6aab9fc@linaro.org> <20261113-topic-sm8650-el2-v1-13-5183f6aab9fc@linaro.org> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/13/26 20:04, sashiko-bot@kernel.org wrote: > Thank you for your contribution! Sashiko AI review found 1 potential > issue to consider: > - [Medium] ASoC: qcom: lpass: NULL deref in lpass_cpu_daiops_probe() on > unprobed LPAIF > -- > > commit 4c412765d7dfc4828c0e1ec1c2ada16e697ee595 > Author: Neil Armstrong > > ASoC: qcom: lpass: support mapping I2S ports to multiple LPAIFs > > This commit adds an optional lpaif_mi2s_desc descriptor to struct > lpass_variant so MI2S ports can be mapped to and probed across multiple > LPAIF instances. > >> diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c >> index f8b9b2ec90553..411eecd9cbb93 100644 >> --- a/sound/soc/qcom/lpass-cpu.c >> +++ b/sound/soc/qcom/lpass-cpu.c >> @@ -1079,6 +1079,8 @@ static void of_lpass_cpu_parse_dai_data(struct device *dev, >> data->mi2s_capture_sd_mode[port_id] = >> of_lpass_cpu_parse_sd_lines(dev, node, >> "qcom,capture-sd-lines"); >> + >> + set_bit(port_id, &data->lpaif_port_enable); >> } else { >> dev_err(dev, "invalid dai id: %d\n", id); >> continue; >> @@ -1121,12 +1123,33 @@ static int lpass_cpu_init_lpaif(struct platform_device *pdev, int idx, >> struct regmap_config cfg = lpass_cpu_regmap_config; >> struct device *dev = &pdev->dev; >> void __iomem *base; >> - int ret; >> + int ret, i; >> + >> + /* Only probe an LPAIF if one of the port is described in DT */ >> + if (v->mi2s_desc) { >> + const struct lpaif_mi2s_desc *desc = &v->mi2s_desc[idx]; >> + bool enabled = false; >> + >> + for (i = 0; i < desc->port_desc_count; ++i) { >> + unsigned int port_id = mi2s_port_id(desc->port_desc[i].id); >> + >> + if (test_bit(port_id, &drvdata->lpaif_port_enable)) { >> + enabled = true; >> + break; >> + } >> + } >> + >> + if (!enabled) >> + return 0; >> + } > > [ ... ] > >> @@ -1283,8 +1320,30 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) >> >> port_id = mi2s_port_id(variant->dai_driver[i].id); >> >> - drvdata->mi2s_lpaif[port_id] = &drvdata->lpaif[0]; >> - drvdata->mi2s_intf[port_id] = port_id; >> + if (variant->mi2s_desc) { >> + unsigned int lpaif_idx, lpaif_port; >> + const struct lpaif_mi2s_desc *desc; >> + >> + for (lpaif_idx = 0; lpaif_idx < variant->num_mi2s_desc; ++lpaif_idx) { >> + desc = &variant->mi2s_desc[lpaif_idx]; >> + >> + for (lpaif_port = 0; >> + lpaif_port < desc->port_desc_count; >> + ++lpaif_port) { >> + if (desc->port_desc[lpaif_port].id != >> + variant->dai_driver[i].id) >> + continue; >> + >> + drvdata->mi2s_lpaif[port_id] = >> + &drvdata->lpaif[lpaif_idx]; >> + drvdata->mi2s_intf[port_id] = >> + desc->port_desc[lpaif_port].intf; >> + } >> + } >> + } else { >> + drvdata->mi2s_lpaif[port_id] = &drvdata->lpaif[0]; >> + drvdata->mi2s_intf[port_id] = port_id; >> + } > > [Severity: Medium] > Can this cause a NULL pointer dereference in lpass_cpu_daiops_probe() when > a sound card links to an MI2S DAI whose LPAIF was skipped by > lpass_cpu_init_lpaif()? > > of_lpass_cpu_parse_dai_data() only sets lpaif_port_enable for MI2S ports > that have an explicit child node under the lpass-cpu DT node, while > leaving child nodes optional when using the default 8-channel SD line > configuration. When lpass_cpu_init_lpaif() returns 0 early because > lpaif_port_enable is not set for any port on that LPAIF, lpaif->drvdata, > lpaif->map and lpaif->i2sctl remain NULL, and lpass_platform_init_lpaif() > likewise skips initializing lpaif->rd_dmactl and lpaif->wr_dmactl. > > However, asoc_qcom_lpass_cpu_platform_probe() still points > drvdata->mi2s_lpaif[port_id] at &drvdata->lpaif[lpaif_idx] (or leaves it > NULL if the DAI is not listed in variant->mi2s_desc) and registers all > variant->dai_driver DAIs. Unlike the platform suspend/resume paths, > lpass_cpu_daiops_probe() and lpass_platform_pcmops_open() do not check > whether the LPAIF was initialized before dereferencing lpaif and passing > lpaif->map to regmap_write(): > > sound/soc/qcom/lpass-cpu.c:lpass_cpu_daiops_probe() { > struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); > unsigned int port_id = mi2s_port_id(dai->driver->id); > struct lpass_lpaif *lpaif = drvdata->mi2s_lpaif[port_id]; > int ret; > > /* ensure audio hardware is disabled */ > ret = regmap_write(lpaif->map, > LPAIF_I2SCTL_REG(drvdata->variant, drvdata->mi2s_intf[port_id]), 0); > ... > } > > Checking !lpaif || !lpaif->drvdata in lpass_cpu_daiops_probe() and > returning -ENODEV would prevent probing an uninitialized LPAIF. > Will add the checks