From nobody Sun Dec 14 06:19:12 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B8C070825 for ; Fri, 17 Jan 2025 14:19:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123547; cv=none; b=mKyOo1GH9R4QVfXiUru/aRe0YSqrt4/VO0pgnHNduVYfK8hUQ6EQL2gYcon4+0K54ucSQbL/vSUdZzTsof/QDZewpt8wOPw77XXPeQFhYvHL5cvCiTFBnRFGqDB7LXD0+wu2VuL0nlR5DpUEOLy7jn8nIkAnzHjz9IYZMl3MuX8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123547; c=relaxed/simple; bh=yG8sQ+nx9Eqw58/wd8HyjrYz0XP+TABX6QtHMArWsyc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=APPjz0RaHSERmSF01se7hMLUifKpSDh74vsvJk9G0raGD/L3m4IhIfd4PLXBU//MKAHdyFFYVUvLfPTGYe4zgCtnqCq1xCnTcUoD1rKemnP2aFNdWp5lFdXEhjLHio2hgBHcDSuSM7I1rDH5NvKFtUCIbRe3Gj8LTnYsOmOEXkU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=MQjFAArJ; arc=none smtp.client-ip=209.85.128.50 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.b="MQjFAArJ" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4361815b96cso14381015e9.1 for ; Fri, 17 Jan 2025 06:19:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737123543; x=1737728343; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=EJPpzjW5eAxwdMtWI5K0l8mGr8BTWJyLsOuy62grEjQ=; b=MQjFAArJ1oQ+XiFb01gGlTaIwCMUZ6/eaMswdNPVP+UdM4o40QJIZ4veg5VEDYPmQr rqAfDKhj6MqIX9tbOcrFqqSazHgM4yVeVSxd/EfGt6mXhtqPCfZM5R0DLPdP8yiFCZ17 Kx9vl30rfvYaAXHn0vcf3taVGqhhTjRjDGitTyNd/hgDt4nojy7Qh/SCf+5cOAMp8CkQ 3tt2jSRMbsKP2b05Gtt2sHxfOhBm5r+cMNjiSF2FsKE/8alqqr1SWsEgCeWPtC0ZRjmU Ya/WH5kkPKpvsK8gPA+iFvsDM4+IjtZWAjF+U61lLe7x8RdrIUZ9jMpak0Pgd0skveDP VQAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737123543; x=1737728343; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EJPpzjW5eAxwdMtWI5K0l8mGr8BTWJyLsOuy62grEjQ=; b=f/WLIDnaNHLqS8A4gih1f1aM+UE53XwRsmO66sMqulacf/0n0e0ORF6zj5zXeB+TLR ZpDrOdMa1Zi12C2RcSwWQTcY/PHtN3tx0TqD/GosWtyA10gHYwL5DhlNQHzn6q4VI8kO PyYVYx6aR/ABgkOxmDpmoGa9uQkQStGBj1I56iAfk59yReA6noTXMF+GTkVtKIjwBUeq jcL00bbnexXJi8N06gLagQ3nNAprEoEv5fOHANGF+ZIlb8/G64xza57kqHbloQ2n4U2z m3SlxN7sYHxvOKqZ7jf9WvvLy88EOg23osZna0Ich2cmbPr13fu82ZeqhZatVmQZ6cLx dy8g== X-Forwarded-Encrypted: i=1; AJvYcCWn/nHlWDTq+CJhclI8x4pupJ9mIIuFMdKJeNFzJrGc2gX/Ibu9mSXuwpVYoS/qHpgaenFqhFjdSE4KV4U=@vger.kernel.org X-Gm-Message-State: AOJu0YyM2X0wky7kKIEcSyaljTgpS2xry/nX3amDaulxnlxVixLzULk4 EUQp+UwWo7JUGrmqSDmNInu+aXgAODghe+McIDNbxH4HfPSC6UYrvf/iVxwnOmI= X-Gm-Gg: ASbGnctQ8be8xEtVwutMlUUiOiLfAtxPz4+XN+pQYTZNIFo7PcqVN38MWAzIYCr7Fe+ SPghZ2xDJJmQONMkZgPqaCL71OSU3pylCZX2ZYf3FlUUcoswNQOfNJ0d2WH7SGPNDzJMiDNai8E Wg3LtOrLbByqsl85MCH4AY1D6UhRU8RelEreLAbEBQLSh2P2ByYSz1kv5mTBegvpZyxZwe1o9gD qx4rGo0bkfZImNVRizh2Npkjo6NIhPmkwkt3/snMlf+K9AnkosHF23QWtETzRIcJ+DSSv+kmg2i 4bJ95qjjqEmrcbh2foY3S3OoksMZn+gpJuY3 X-Google-Smtp-Source: AGHT+IG5K3FNsGuzWqRixT4OiMWoWe6dLCzIRKc7oOU3K/CehjLULkM8EVMs4EBMJ03fSNI8Cqn0wA== X-Received: by 2002:a5d:4e86:0:b0:38b:d824:df3 with SMTP id ffacd0b85a97d-38bf57890e3mr2043468f8f.24.1737123543332; Fri, 17 Jan 2025 06:19:03 -0800 (PST) Received: from ta2.c.googlers.com (169.178.77.34.bc.googleusercontent.com. [34.77.178.169]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74995f6sm96764195e9.1.2025.01.17.06.19.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 06:19:02 -0800 (PST) From: Tudor Ambarus Date: Fri, 17 Jan 2025 14:18:50 +0000 Subject: [PATCH v2 1/4] soc: qcom: ice: introduce devm_of_qcom_ice_get Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250117-qcom-ice-fix-dev-leak-v2-1-1ffa5b6884cb@linaro.org> References: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> In-Reply-To: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> To: Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Ulf Hansson , Abel Vesa , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , Eric Biggers Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, andre.draszik@linaro.org, peter.griffin@linaro.org, willmcvicker@google.com, kernel-team@android.com, Tudor Ambarus X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737123541; l=2995; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=yG8sQ+nx9Eqw58/wd8HyjrYz0XP+TABX6QtHMArWsyc=; b=XYQFpfWRMZlFbEbuuaOCZ4aYKbikkwMh7NOh050v6RV5pq7o3U3s8DytNgIi/EzzIkR8kxinl Olkd6PT8mK+CLzSZcBzMMXEmMb1XtCif7d7l2h9XI0JbH14ZTKpkBWo X-Developer-Key: i=tudor.ambarus@linaro.org; a=ed25519; pk=uQzE0NXo3dIjeowMTOPCpIiPHEz12IA/MbyzrZVh9WI= Callers of of_qcom_ice_get() leak the device reference taken by of_find_device_by_node(). Introduce devm variant for of_qcom_ice_get(). Existing consumers need the ICE instance for the entire life of their device, thus exporting qcom_ice_put() is not required. Signed-off-by: Tudor Ambarus Reviewed-by: Abel Vesa Reviewed-by: Krzysztof Kozlowski --- drivers/soc/qcom/ice.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++= ++ include/soc/qcom/ice.h | 2 ++ 2 files changed, 50 insertions(+) diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/ice.c index 393d2d1d275f..79e04bff3e33 100644 --- a/drivers/soc/qcom/ice.c +++ b/drivers/soc/qcom/ice.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -324,6 +325,53 @@ struct qcom_ice *of_qcom_ice_get(struct device *dev) } EXPORT_SYMBOL_GPL(of_qcom_ice_get); =20 +static void qcom_ice_put(const struct qcom_ice *ice) +{ + struct platform_device *pdev =3D to_platform_device(ice->dev); + + if (!platform_get_resource_byname(pdev, IORESOURCE_MEM, "ice")) + platform_device_put(pdev); +} + +static void devm_of_qcom_ice_put(struct device *dev, void *res) +{ + qcom_ice_put(*(struct qcom_ice **)res); +} + +/** + * devm_of_qcom_ice_get() - Devres managed helper to get an ICE instance f= rom + * a DT node. + * @dev: device pointer for the consumer device. + * + * This function will provide an ICE instance either by creating one for t= he + * consumer device if its DT node provides the 'ice' reg range and the 'ic= e' + * clock (for legacy DT style). On the other hand, if consumer provides a + * phandle via 'qcom,ice' property to an ICE DT, the ICE instance will alr= eady + * be created and so this function will return that instead. + * + * Return: ICE pointer on success, NULL if there is no ICE data provided b= y the + * consumer or ERR_PTR() on error. + */ +struct qcom_ice *devm_of_qcom_ice_get(struct device *dev) +{ + struct qcom_ice *ice, **dr; + + dr =3D devres_alloc(devm_of_qcom_ice_put, sizeof(*dr), GFP_KERNEL); + if (!dr) + return ERR_PTR(-ENOMEM); + + ice =3D of_qcom_ice_get(dev); + if (!IS_ERR_OR_NULL(ice)) { + *dr =3D ice; + devres_add(dev, dr); + } else { + devres_free(dr); + } + + return ice; +} +EXPORT_SYMBOL_GPL(devm_of_qcom_ice_get); + static int qcom_ice_probe(struct platform_device *pdev) { struct qcom_ice *engine; diff --git a/include/soc/qcom/ice.h b/include/soc/qcom/ice.h index 5870a94599a2..d5f6a228df65 100644 --- a/include/soc/qcom/ice.h +++ b/include/soc/qcom/ice.h @@ -34,4 +34,6 @@ int qcom_ice_program_key(struct qcom_ice *ice, int slot); int qcom_ice_evict_key(struct qcom_ice *ice, int slot); struct qcom_ice *of_qcom_ice_get(struct device *dev); +struct qcom_ice *devm_of_qcom_ice_get(struct device *dev); + #endif /* __QCOM_ICE_H__ */ --=20 2.48.0.rc2.279.g1de40edade-goog From nobody Sun Dec 14 06:19:12 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1B47148FED for ; Fri, 17 Jan 2025 14:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123550; cv=none; b=qYqbPhJOgzHrLh+UbL3LPsWUgxiIcJekrAdGin1DYP6Md2HL8MWA0LRY70Qh2HX6xxnUJA03A0zGDicPo5NDm+IVi44qvg7XXzuyDIwp6WkHhVMti7HZ8pyVYOzASBarLQmDKWNSOiVdEMJ+OnIYFn1++Z5x+NKA3JaSEOd/r3Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123550; c=relaxed/simple; bh=GZ2r5p0dFfNcF1ZvOqiFJYmYWFEQPwiZzMJJY9diiqM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s/CPyhgegRJknHq2MnaYoDZv2oPiLC+GbTDIIAO23OWgdOSsLtocGEfRKBeOXbMwJ/y64bGsDfMkP/cB2TJFipIzruHafGov8VtgWVi6hRaXacdwp07SWSXgRdOHUCNqEXuh7A2A9fyD3Tt7t2OhJpShlUEy6OLWpPjFOSABzhs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=RUMtBizF; arc=none smtp.client-ip=209.85.128.45 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.b="RUMtBizF" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4362f61757fso20809845e9.2 for ; Fri, 17 Jan 2025 06:19:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737123544; x=1737728344; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=TrQMwi+hF2C0bCOO/tTN4XbolEHkOKYGtBgFZ4HZCnE=; b=RUMtBizFVYX0qVr4FBO/0JwxgbuH49a0YsV1JJd5j9CQ29Lf7Rmmk7qaTi+lF+elXQ h2+FrVeeNJIffu4ZwhyO5Hox1KLKtaQRmlU0H74LwrMt3H9KBoOod4P5kuLXi3PxhKVB Rs/flOJ8kfJnuTXkXvdXBxFc60uztwrA6eXEVSWoqJdh5c9Dma62nhHpXJ1tjA15lqj4 UXYtfWtTwgoNmNXj24As2pjtYccfOBw5nUooFpbTHpMxcBKWygyR66Ld8+au+LyH4grm lG1mm8Di+Ua108XhybY+rBWap5F3oHy5szKaUoix5k4ELR+SMTPNkh3yN8k7tL9LU+df wdfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737123544; x=1737728344; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TrQMwi+hF2C0bCOO/tTN4XbolEHkOKYGtBgFZ4HZCnE=; b=Sso0pSoKomi9KG4/5pB4l+xF7d6+4/6d6KJBQWjhsMzxeiWvW+xwFxtwFLZPa3F+1J X+irGrm2eJDVYR8RjSf/GYn6Cd1s6QehcmuC9Z9Mg/TBbF663nfH7qF8Da5RbLe16jBd V4nXf2r2U0fXjwhtLLBzIr4uaEfcP0geXRY4BfzX5V1MgVeF1bLqovR4vaEvc6W0M2Wp NcawltzuvEFs/Yg2W52izSokh9k5uiRT7VVPYx9I0mrQs64dbuINHK6ngGKxUGA6AC+M Dj/oXVeHk2zb1YgIKqIJiR/8VlXzQ2LEtKBpjlgaL2P6r8ZfLvIfho5Lyl4OFTGsfUcs lhcA== X-Forwarded-Encrypted: i=1; AJvYcCVcvgezQ1S6wn4/YgFvAGSLdSNf3sWYmyw5RYyTCJH5N1m1191cE6e7agJAQOQ4exL9+Wp3ibcDvpXtiFw=@vger.kernel.org X-Gm-Message-State: AOJu0YyBnZpv/IC3rr6WFxUVoRRHMQJ1u/Ml5/u0UhuUqXggNJoW1tXJ 30wdIv4RIIMnvmwzRE/rMuW2LNX/JsMJPIX0wbFbo8umtmLWmG8LE46gSLYqE7Q= X-Gm-Gg: ASbGncvqCExJfxXqvl7g0KifgQRfMehHZvlCr80OqUZcuNlQsUhAxg7PD2keqUU+eI3 Buuk5PJhqB9FWNsX6/wXCFB1trrvB4IVIlvJG4bX4eeg7ddSQq8VgucSwxP7uqucYVOj3OgMMXs kq4/XQg2PvtsXTmKTEYhVswR5l+TD2y7hFZToyQLy5RHH+MqBTmR6zkS4HolqOhPFQAPfHiKu8n yAeocoIIbNE2j2sPMQUgUkD8QVoh6D+2956ecVCD898DaBjpepH8LLMkglPn8L/mWkS22NKD6Xi Hh09zNczyGXSWiDTXWvnugLkRuNpFg9GxIIo X-Google-Smtp-Source: AGHT+IEfaWlQCEKKaatnAdlw13qgkLJVr8s+K3HBqqjRbB4QuuaaO9z/foSCuP32eVd4AGEznbyiWw== X-Received: by 2002:a05:600c:ccc:b0:436:1bbe:f686 with SMTP id 5b1f17b1804b1-4389141c073mr23873315e9.21.1737123544308; Fri, 17 Jan 2025 06:19:04 -0800 (PST) Received: from ta2.c.googlers.com (169.178.77.34.bc.googleusercontent.com. [34.77.178.169]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74995f6sm96764195e9.1.2025.01.17.06.19.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 06:19:03 -0800 (PST) From: Tudor Ambarus Date: Fri, 17 Jan 2025 14:18:51 +0000 Subject: [PATCH v2 2/4] mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250117-qcom-ice-fix-dev-leak-v2-2-1ffa5b6884cb@linaro.org> References: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> In-Reply-To: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> To: Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Ulf Hansson , Abel Vesa , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , Eric Biggers Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, andre.draszik@linaro.org, peter.griffin@linaro.org, willmcvicker@google.com, kernel-team@android.com, Tudor Ambarus , stable@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737123541; l=1054; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=GZ2r5p0dFfNcF1ZvOqiFJYmYWFEQPwiZzMJJY9diiqM=; b=45d3iiXT7ApSj86eCeo8o+vCQk8H9LTCNmewvtv437mzQ3nPnN5PwM2jJJAI++4mdsjm8dOa+ C8c22bdPYz+B52Him4FeCPJNwliX9YaycwJvlhaqizsV5BZY8YMv59M X-Developer-Key: i=tudor.ambarus@linaro.org; a=ed25519; pk=uQzE0NXo3dIjeowMTOPCpIiPHEz12IA/MbyzrZVh9WI= The driver leaks the device reference taken with of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get(). Fixes: c7eed31e235c ("mmc: sdhci-msm: Switch to the new ICE API") Cc: stable@vger.kernel.org Signed-off-by: Tudor Ambarus Reviewed-by: Krzysztof Kozlowski Acked-by: Ulf Hansson Reviewed-by: Abel Vesa --- drivers/mmc/host/sdhci-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 4610f067faca..559ea5af27f2 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1824,7 +1824,7 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *= msm_host, if (!(cqhci_readl(cq_host, CQHCI_CAP) & CQHCI_CAP_CS)) return 0; =20 - ice =3D of_qcom_ice_get(dev); + ice =3D devm_of_qcom_ice_get(dev); if (ice =3D=3D ERR_PTR(-EOPNOTSUPP)) { dev_warn(dev, "Disabling inline encryption support\n"); ice =3D NULL; --=20 2.48.0.rc2.279.g1de40edade-goog From nobody Sun Dec 14 06:19:12 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B97261465AD for ; Fri, 17 Jan 2025 14:19:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123550; cv=none; b=FtcUFc2wCc9ErPLN0IhlYbFPei5IMlPgDWvry24NXm4G/FDfQnAsoMPAVir+tg3xoxqJV+RrxbQTmRkiMNvMfhSHEnOgT1k9KeOI0X3eNQ1srJYaHJohfPpFNS3MSKrxCxG4kXfO9tNMY8x7+bl74Ogqb2fr06cbk4HWKyTmKEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123550; c=relaxed/simple; bh=oCdvQb+2nS9fJzhI+yPgqLPClQAHie77kio2g2kgZyQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s2a+Zdc6/CbBA2gKTYIeg5bcwvEyTy2h8wbobN3HbD3Sd7KXvXXydzywrkJO81NDfdWZZdMWTLDOAI0b/mI/5PTZOlZCVralzcG5QFjQ0Yxle4ZWJxevBuV6o8LANQnFnhnpmaZdwpGZ5pAotBYC/8sH63dmT+QovocsD2HfPd8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Lm4m3tOZ; arc=none smtp.client-ip=209.85.128.54 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.b="Lm4m3tOZ" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4361b6f9faeso13682045e9.1 for ; Fri, 17 Jan 2025 06:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737123545; x=1737728345; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uj4Spml5sM1tLHD2FfSBP66Bq5uP7mY7z+kcAwA1e+w=; b=Lm4m3tOZgGLYku8A4Duk7FaAf91ECH+x91nGUZlOLZQK9ySCH+/GNaUwibHPg/xWCP uckObVu4HbsGiZ5woqkGSowlAjQJnXiaNys1y5E6kmy+8ADRYTbq6k/QoENr6TU+ysXi tDCfEwYnAJ56DSExAwIdvUR+B9k04bCow9iYH53HLpSCPIdDvCxfxaztGoW7wUnQL8Xc 5XVF64hudXCPCzbzRSBaphDQWBOeWcxKGT5ZsG3+0A8/LBawIRBSp6DGWbfH0pL7kTR5 JrcvcnNq9d1oxQ7sBDFycTmr3CvbN3e4Xj7Lj0AHT/rQHxou/r34wLybKvGalw/utGjX ZI5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737123545; x=1737728345; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uj4Spml5sM1tLHD2FfSBP66Bq5uP7mY7z+kcAwA1e+w=; b=pJL3jw+hRGNcGUlOVqjiobBgr8PZXpwE+gl0Dh7rNZyPmUjACltVXh1FBUvPkORBUD foZl+xY/NfjZmz7ahv8VuhhSmBRKXfoyWuo2FS53sXb26xQwCQwKwY2v/kv4VUXyEG2x XOwQcyv/NM09TEq0lJpfGh0/IiAJdcB5wpZZMlPTRWHIFmBIvqJ/dK9n2YfHIzniisRp anxhJhvUYuJCY9v4q+oZO1eoa5ZTOtiH8LK4trDOudiDDX7Fd9TgxHtNupntBSUoFXKE W58N7dxCCahkIk+2xCood4re3KjKGRN2J3v5zQR9KEpHV/+DFfe/vTjqoCnd8WsPMzHR rtJg== X-Forwarded-Encrypted: i=1; AJvYcCVyZXLZrt1OaDAP7Jt40UTDAy/qlQbaTqY+11NXlvWN94Q5pACtmHRQf+KSxgWPuRLybiABy1JZ66wJvf0=@vger.kernel.org X-Gm-Message-State: AOJu0YwJ/pZaO/AB8hdwqtfNwJYSXniZncz3D7M55KptnXjs9OxpcWwU hdDMI7sBzObMJ7uBU15C3mTLkC4P9fmBJdMNS0tUNedItD5MTcWVOLJp3XJJgHs= X-Gm-Gg: ASbGncse4A1E9GjHt3s0eHbvYDfI+qalxAzcsgQLGUrGHJuctqPPPjWC35QY6um4lOU G+tJ0yFe32aeivzLEJER0zmg9W4DvKKFsvq0HN8ow8hLg3ZRJiJFCd8VnntKkP/+9AoyemUoN8q VR9FepLmgZ7GON5BcR4RAtJ1oriObQs9nWMxFfliT5KRKwTRot0CbirfV1gYMJFp93wqQVjC/fw w6mksc0UbGXtL3tMcR6SqNqSxtVh+UvuuMNDvt/8577ljoD30I/3vekdIVYskdJtQyEGobG6SOO E8iCC7JNbQ9wRZVAk5suvzEwafpqYqtNbVck X-Google-Smtp-Source: AGHT+IHtJFuj1A/6iNliKs9eQH9rrj4V+OnOFmOpiyVc7p4nqfhLVN5vCbRzSx6Je0dj2NPJh1Qeww== X-Received: by 2002:a05:600c:698c:b0:434:f9ad:7222 with SMTP id 5b1f17b1804b1-438918d3bdcmr26936585e9.7.1737123544993; Fri, 17 Jan 2025 06:19:04 -0800 (PST) Received: from ta2.c.googlers.com (169.178.77.34.bc.googleusercontent.com. [34.77.178.169]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74995f6sm96764195e9.1.2025.01.17.06.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 06:19:04 -0800 (PST) From: Tudor Ambarus Date: Fri, 17 Jan 2025 14:18:52 +0000 Subject: [PATCH v2 3/4] scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250117-qcom-ice-fix-dev-leak-v2-3-1ffa5b6884cb@linaro.org> References: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> In-Reply-To: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> To: Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Ulf Hansson , Abel Vesa , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , Eric Biggers Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, andre.draszik@linaro.org, peter.griffin@linaro.org, willmcvicker@google.com, kernel-team@android.com, Tudor Ambarus , stable@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737123541; l=948; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=oCdvQb+2nS9fJzhI+yPgqLPClQAHie77kio2g2kgZyQ=; b=163Vcmfi+CsUVQeVZqwtnnkJb23luP5Bc+ZhUo0gynzhVHSf6qNM8NDwwDFi+n47kS2Sd6yOD wnJaevqnGsfBUfI2PFwXCIqHHI8DVN8amrNysqTsb/QFG8nJx2n07F5 X-Developer-Key: i=tudor.ambarus@linaro.org; a=ed25519; pk=uQzE0NXo3dIjeowMTOPCpIiPHEz12IA/MbyzrZVh9WI= The driver leaks the device reference taken with of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get(). Fixes: 56541c7c4468 ("scsi: ufs: ufs-qcom: Switch to the new ICE API") Cc: stable@vger.kernel.org Signed-off-by: Tudor Ambarus Reviewed-by: Krzysztof Kozlowski Acked-by: Martin K. Petersen # SCSI Reviewed-by: Abel Vesa --- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index 23b9f6efa047..a455a95f65fc 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -125,7 +125,7 @@ static int ufs_qcom_ice_init(struct ufs_qcom_host *host) int err; int i; =20 - ice =3D of_qcom_ice_get(dev); + ice =3D devm_of_qcom_ice_get(dev); if (ice =3D=3D ERR_PTR(-EOPNOTSUPP)) { dev_warn(dev, "Disabling inline encryption support\n"); ice =3D NULL; --=20 2.48.0.rc2.279.g1de40edade-goog From nobody Sun Dec 14 06:19:12 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD5A8146D59 for ; Fri, 17 Jan 2025 14:19:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123550; cv=none; b=FWnv8fCrqn+J2Ev5A+exswcIPmB2UReTNx3tvnY2iWIFYSfKsiF8k1ZGRSK+i5ygJ6xZ1UeoF/g67XszdwU6PUknGMG9jLZj7lP2YnEemgVnsWY6yBNsj8ejJ3V/dVjszR6JdvF7U56LUMBqYctSzoFKlirVKRz1DKukVhclVXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737123550; c=relaxed/simple; bh=rkN16KFyfCGbANv1URyC5pgmPDjOKr7gcHvrAmLZiGk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dUfOCT48ZNuqg5mBY1IiiKmDJ+EZ4oMHUaLmV1jC1HI9qFeKL4diCHtc101A98kq/EH2OicKZo90+1oEGh4O141OOQF+0bdwcpO1tM7E3TWxihtjmsdGDJH6cuFM34DqzgxJU7waRM/RjZoeJ9laHl+MA3z99zcmihhnLPTZPIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=RFLZapW2; arc=none smtp.client-ip=209.85.128.47 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.b="RFLZapW2" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4361b6f9faeso13682175e9.1 for ; Fri, 17 Jan 2025 06:19:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737123546; x=1737728346; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Iw3hbPMx3DDHttAVH5KXQAb7aC6TLapsYr3FJPMUjSk=; b=RFLZapW2iKxxI8T3dcu5OKvgO6KtaG5AFr2Y+YZdn+ocSk+15Efbz7fjDPCQauc/Of 5MqGBrnQdmdpO/oyYETWL4wb3lcTg1qkbriLA/qjqAM+xF3w476xErqlA/GMrEEk9pcc pRuLppqbLvw3kDNiVQ/+Fx+dxMu/uq5tuMlMWCj3ek68UzP1bRzR0wzWG7XNRp0xqocd WmCfCOxjtcKqpB+2UpVUPBuCzejZbjsUjK556UQ8BrBLiRTRCpuj0VVk2b/Jc5CeiH8z 2U9+PqEa5p7kpPDyHiWSMLJzlA+vKfKkHqmgcxtCbUQs8J80AEQyijVB6GKLnrS9+hWj dD9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737123546; x=1737728346; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Iw3hbPMx3DDHttAVH5KXQAb7aC6TLapsYr3FJPMUjSk=; b=uaX1qgFIxOi06UIuZGRlHWDddfrZoo7xflm72uwoUSKHRfydUo+RRMTscD0n2mbdAv 8AAeFeX3oU/v4FkAC5LPHXt1snhZYP5ZfASME44pVftcZdj/04tdk7aIddm7EqLAu8f+ iSYWtF2oU5BBmKGwNFbpzU05JTaAGyeKpn/BTsGmrKqpOf+bj+Txx9z5pDSc/DpiMtfB Cu3mcl1MJ90K+NgeFzWcYIIixebRAhQE2/nP5ytAbsXwBb9IExnbbh++fRA32Uyj51ZB nuq2B4VwE0+M6VfjOGBTjUZUGcMWDqXj4EfCFveEhpKZ7xQhQLfA39m1nzSVwEgcURdY LQVg== X-Forwarded-Encrypted: i=1; AJvYcCUenSVtIxiLDbfWUHriDjPJnhpprCcforBlcPtEOHLa7KQvTU+5XXOWUm5GmwxdLF9lzwA+SJDcZ+PGkhg=@vger.kernel.org X-Gm-Message-State: AOJu0YyOzOnic/eF5Kkojk/NlDTJ/rjUruVSohdHrUP8sEmhEs7Kawiu 3wMKzPOI8O7pN2oFF7eynov/CiDfKS1cqjm88MVxHVH6sYwPmXKpkrRY5HvsjPg= X-Gm-Gg: ASbGncsyRo51nsTveXjj/5/Q6igJ5mXwt/ZgUPocj84YEadHCIlis6KqyORwhFlHBoY KyR6Z2q7wHU4z1rtYm+EWsXYDGlmyHlkEu6tFlQga714Adr24K9XLgnc1X5LwYevgNCAPPt05cN wdlrtUF2KpgAYhFDu60wah9tCXpYt3H3FBCCcTOESikzRmBnUHiP5fDgk4Hf2B6V/Ft7Z5uWdEc r/vwzpj6/aaANWRvBb08tsZ+hFa4xID064BBEr7Dw1KX8R+iemD1MmQiKVWLOcFznZKCIbyrzIq tRmtaGnWE0UHvD3AR3hZkPKYwSgRKd4w+qPv X-Google-Smtp-Source: AGHT+IETblMrx8KIRmwK9VCr83hmCG0f17UdDxWZUvSUIiOhoWXqGDdx+je3BMGMgRQiM12epULhgw== X-Received: by 2002:a05:600c:698c:b0:434:f9ad:7222 with SMTP id 5b1f17b1804b1-438918d3bdcmr26937075e9.7.1737123545938; Fri, 17 Jan 2025 06:19:05 -0800 (PST) Received: from ta2.c.googlers.com (169.178.77.34.bc.googleusercontent.com. [34.77.178.169]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74995f6sm96764195e9.1.2025.01.17.06.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 06:19:05 -0800 (PST) From: Tudor Ambarus Date: Fri, 17 Jan 2025 14:18:53 +0000 Subject: [PATCH v2 4/4] soc: qcom: ice: make of_qcom_ice_get() static Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250117-qcom-ice-fix-dev-leak-v2-4-1ffa5b6884cb@linaro.org> References: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> In-Reply-To: <20250117-qcom-ice-fix-dev-leak-v2-0-1ffa5b6884cb@linaro.org> To: Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Ulf Hansson , Abel Vesa , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , Eric Biggers Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, andre.draszik@linaro.org, peter.griffin@linaro.org, willmcvicker@google.com, kernel-team@android.com, Tudor Ambarus , Krzysztof Kozlowski X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737123541; l=1621; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=rkN16KFyfCGbANv1URyC5pgmPDjOKr7gcHvrAmLZiGk=; b=GkVvea3pMVMpJEOFkCogbzhGJLadWWc2COyDHp4IFtQvqwN8HlMWhUl0amrJXjGiMy0W2cgM3 AqCC1xa+8FLC3UvoQfVuAwJIX32Ugg/vLxSxUTTBxQ4yk/FSRFpuR10 X-Developer-Key: i=tudor.ambarus@linaro.org; a=ed25519; pk=uQzE0NXo3dIjeowMTOPCpIiPHEz12IA/MbyzrZVh9WI= There's no consumer calling it left, make the method static. Signed-off-by: Tudor Ambarus Reviewed-by: Krzysztof Kozlowski Reviewed-by: Abel Vesa --- drivers/soc/qcom/ice.c | 3 +-- include/soc/qcom/ice.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/ice.c index 79e04bff3e33..2310afa77b76 100644 --- a/drivers/soc/qcom/ice.c +++ b/drivers/soc/qcom/ice.c @@ -262,7 +262,7 @@ static struct qcom_ice *qcom_ice_create(struct device *= dev, * Return: ICE pointer on success, NULL if there is no ICE data provided b= y the * consumer or ERR_PTR() on error. */ -struct qcom_ice *of_qcom_ice_get(struct device *dev) +static struct qcom_ice *of_qcom_ice_get(struct device *dev) { struct platform_device *pdev =3D to_platform_device(dev); struct qcom_ice *ice; @@ -323,7 +323,6 @@ struct qcom_ice *of_qcom_ice_get(struct device *dev) =20 return ice; } -EXPORT_SYMBOL_GPL(of_qcom_ice_get); =20 static void qcom_ice_put(const struct qcom_ice *ice) { diff --git a/include/soc/qcom/ice.h b/include/soc/qcom/ice.h index d5f6a228df65..fdf1b5c21eb9 100644 --- a/include/soc/qcom/ice.h +++ b/include/soc/qcom/ice.h @@ -33,7 +33,6 @@ int qcom_ice_program_key(struct qcom_ice *ice, const u8 crypto_key[], u8 data_unit_size, int slot); int qcom_ice_evict_key(struct qcom_ice *ice, int slot); -struct qcom_ice *of_qcom_ice_get(struct device *dev); struct qcom_ice *devm_of_qcom_ice_get(struct device *dev); =20 #endif /* __QCOM_ICE_H__ */ --=20 2.48.0.rc2.279.g1de40edade-goog