From nobody Sun Dec 14 06:16:26 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 F271022B5A4 for ; Thu, 16 Jan 2025 14:49:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737038971; cv=none; b=oLswP3LwudJZZIlgnbRyUTMTKtLK7Tx6+tcguKyCvxuoGKIe1FVQ2prSvKzBHHS8Cmt0F5ujQSpNDAs0fP3woEcKPoX30rLPxYl11psnZzhq1WDFRZf+OQ6DmfnjatCCjkmaxiO4z3gEBAbhnHbCNqqoiXYMH/twpiJTzvWgS5k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737038971; c=relaxed/simple; bh=yQnJYX0uPLjPaWJCg5DBrwaaox/zrNkiPK9/oReRrBQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bAiSC1KSsIFPRx5ZX3os88HAxn5cV5SUikizbP5LOmGgeevzamwhkaHBoy7yV1td/2aJwa2SUc3IySfBmKT8rvm6pgqMwYX8iRoqBsxnpnsPs/2c8ES13LYMyKITlzU1JJPXauHu7EMqSdSw8CQnsUB6tyhiCvkxfMtHz5rgrBU= 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=l2e090i0; arc=none smtp.client-ip=209.85.128.44 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="l2e090i0" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-43623f0c574so6603635e9.2 for ; Thu, 16 Jan 2025 06:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737038967; x=1737643767; 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=IQqtN2LlHzbsYqCaGCM4YS8VgGj6g0tDMtNz77m0JDs=; b=l2e090i0Q8lcEfoEJsWtJ99BHhcbAEsb55xutF1JLErna75gulQL3KLZKfyrms7Mxw fR/DY1GEeSTmhcyJnlEqIWAvRyUhDLs2cKkqSUDI3hemWKNT+oYSuIbHO4YFihycpBZ3 ulB/Dmw9iA4XV65snB9l8q3jAXkcrHgwCRFB7LhKNJGkXMuym7Sj+i8NwRYl1qGDnhz6 NZA9sCEkf1DS8Y1Mzug0Ij410SYnAx90Yql8W0UlZnfN4BaxMgAl6DkJNXpjFZDn0n/7 GU6NBLnKxBTMLctNwHWMamjSH+GjjYjiMrV3ECy//vU34uqgIFlgI+W1BaHOKQweXeiB mRtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737038967; x=1737643767; 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=IQqtN2LlHzbsYqCaGCM4YS8VgGj6g0tDMtNz77m0JDs=; b=LtJ43WiVAeZJ2f1z7MUptC0A26Uf44AQe9cWhM/wHHtV+xeTC+WhzENkQpGF8yrrsI fk++sbxxQl3DMWezFnA+d5qK4kYLPDWWhEfbUAK2c/vS49OKwdXWXrY8gPUuuzg+W5/d h/CLmaNTO2Dk3T2F7gIKzy3GxFdkt5ghCVtYoDB9ZpCnZnnNkFpcXHTvFr4Ol29LZFZ3 XzsOQHxogXEg5fiH7EE7kHeO+GSmY7CDa3mOX0KfVpZjFnT98hB/I04PnnbA5OyRNVO5 ebwPOKmMxPc6WwlUEe6t2DoK6JpBbrt6spZnVNN3oXCBUiG4QOmSNWx3JtSv6ecwcY0l vuUA== X-Forwarded-Encrypted: i=1; AJvYcCVlxcXnahOj2Y6DoRWQujuyoEuA7fjAoV9q1kpuZixQ+qhhx1005CIr9mRg8KabHeCJJjgYO6HclavE6dU=@vger.kernel.org X-Gm-Message-State: AOJu0YyNvQ+YJmmFRz+HVEAbk99O08gaeJtzXDqmjvb2nExFNmYC4p0Q NgzTZANxd7Abs19ClJxXqsMa1JKrgssMgg3I0Od0YA7JjwbhCJHh3duZGqbJJCU= X-Gm-Gg: ASbGncswkmwk5t7P/bRlHjh8FxWRd5I1HzMnB40yxgI8nOlzhbK/DqYD9JBZcXgvRZ4 Fv1x7NQDLwadS6n1ADjwqhPRQkDNmQPUmBOfLZDUd814RuMui+EZ3Kb/TS70Quoe6eNBSmbccGN pTmLlfN/ifE6qBPQ8LePlkkv8Epkrgg09vbPPwQCX1NN9gjva/wZHNmKuC32mg10EudnDOcVpSO iugrM+/kwk1rGbq/Q1P60DhtmRRi+UtmpIwR2k1NpAMA94iVIxq3j0AWTRtXuSC0wmqwPvOfCPF MaEoiJ9Cy9KG4RhqxxX4YhsKoWcELeQOjIHq X-Google-Smtp-Source: AGHT+IHRJ4zrdb1ZRXErSV709NTqBsRUMyS0Kfg5tPapw4Kqm0cLHb/MJRkLo19NNccX4K+54bKn3Q== X-Received: by 2002:a05:600c:3c82:b0:434:a10f:c3 with SMTP id 5b1f17b1804b1-436e2696082mr301334975e9.9.1737038967196; Thu, 16 Jan 2025 06:49:27 -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 ffacd0b85a97d-38bf321508esm70310f8f.10.2025.01.16.06.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2025 06:49:26 -0800 (PST) From: Tudor Ambarus Date: Thu, 16 Jan 2025 14:49:05 +0000 Subject: [PATCH 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: <20250116-qcom-ice-fix-dev-leak-v1-1-84d937683790@linaro.org> References: <20250116-qcom-ice-fix-dev-leak-v1-0-84d937683790@linaro.org> In-Reply-To: <20250116-qcom-ice-fix-dev-leak-v1-0-84d937683790@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=1737038965; l=2250; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=yQnJYX0uPLjPaWJCg5DBrwaaox/zrNkiPK9/oReRrBQ=; b=dvOHW0gq57zT7su0+EvrZUYQUdDDd52T/OiLXmz9qbseW7TNEx8fJuXgbrcX10BK9uz7fBYdf xSVXGVPO2zLA8oEk6fKZbw1aWt2g8ht6yA1GYf/x52/vAjCy7Zwwvs+ 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() to spare consumers of an extra call to put the dev reference. Signed-off-by: Tudor Ambarus Acked-by: Ulf Hansson # For MMC --- drivers/soc/qcom/ice.c | 34 ++++++++++++++++++++++++++++++++++ include/soc/qcom/ice.h | 2 ++ 2 files changed, 36 insertions(+) diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/ice.c index 393d2d1d275f..9cdf0acba6d1 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,39 @@ 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); +} + +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:16:26 2025 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 AB6CF22B8AB for ; Thu, 16 Jan 2025 14:49:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737038971; cv=none; b=j/JLmMvzK0Uy/l5aR76kkbtNdVxHnsYTnctst6vXRfBi18anneTdoz8LdxRje6OAB0n7VEv4UvDlrtJZyyTLDq1I3fo37o+ItN9pxbNfhauuLQbGE3QYhJ+/TSvWIBcTPK7Ydhee687WiVSBhiO9RWhKWAfAs0OFeD9O55GHRHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737038971; c=relaxed/simple; bh=Wje1BciONDqQrKQyhp/R22j+9s7pjT1C1mQYS4XxTmo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HUY3O79xLCnFVqxGJrK7+di2kRNhLFPXg+s2GD0pjrJ6w2rAwBtzBLYpb/vgT92uQTRW9G9r8Euin5Hp2VZsfFkI9k9Xh9UVmshnv3Xom3lTrWmJVwFMH7QF2+t+/ylwpWjticMAdBcqj28FGJAsb6Ran9wouCzeD9VwD5xPcJA= 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=cj4BxhIO; arc=none smtp.client-ip=209.85.221.51 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="cj4BxhIO" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-38a8b17d7a7so550187f8f.2 for ; Thu, 16 Jan 2025 06:49:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737038968; x=1737643768; 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=rbb6Ezfzp9O8O/V6bl6D5LDxeK+r+UlRD6ckNgY/1gU=; b=cj4BxhIOazRcHCNPKjsyeoxRxz3FuQ4Ok7sBqmWmD1tVSWnG27HKkfrR/NoN8ftx2I VEsUNWMd6b8voWUmiayk67a6BwE6ZAuE7BLfM+cLRX5WUTiB2o5I6CKQIv1MhopaLRoC MbFd3V/x5dGnX6EqIcbFKwDV9pKahE+HZAyFHgsWmGDJO/esypA1uxFBJcqvJyKK0fyS o510CMK33n9WCSv6mOZBx7P5/vALGzjjUF1l1nHVARra/93O7A3uAQYoUxDNpiHmI+jP y4uE6Jb54xEwxChGoUvFhn4IbFLt1eWx5J5my2duEQmmgdzOuX6I1nV9VjwtwTeLFoOQ 2p/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737038968; x=1737643768; 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=rbb6Ezfzp9O8O/V6bl6D5LDxeK+r+UlRD6ckNgY/1gU=; b=Eg/plUDYsInFXu3h6V8CfL/XMleTiL4QmYJyjJpaIqzMjwl65AbXfKILzVymU4AaBz crctyOWzKADBr2H9AyizZmnk8Vi0hgDAHQgEp437OHJwMKQkktjnU1Df6N+Jn3WpLhLH lT6RBs+UVhCfu8gD3tVU1IxiO9TEUpC/A2FQtcA0MJHzxIngKSZIbesyIOXZxQv86i1v eb5+5ftXlwepYwU1YKQcuCeGa/0sxgvL+4uFebwObOxls1OGjHwEp+SOnIjTE3mmVNxh AJsikU7nmscT7M+tfxg+ysriDuBh1Atw5FLv340/PhYeD9QpvvrQq6bnn3Z7MQygeZcq rqjw== X-Forwarded-Encrypted: i=1; AJvYcCWlvE/ViswapcNyk65fuFp3tHhtSUOLQpAmLS1NdLP4COpiv1oEw0I2GN75WCnDHEABKW+MODzvkxE2uN8=@vger.kernel.org X-Gm-Message-State: AOJu0YyvCyAYhjgS/e0rqxbJgIW6C29d4vBx2h4O40FG8f4lXpcnkuBy knq0yXGsuIpi58/huyup6xU51j1zgQ3kcGQOehpNDDKXqifFkzrUEOB+RHEWDTQ= X-Gm-Gg: ASbGncsmZqUpoEcyFFf6bXzASNoqEk6KNoEt24RKAMdMFuxR84n6zjzUPKvVKqdspBK ZTRmUAYxt6jY1cZp4k3s78rZq94yunJvqCU5O8wWrSP9sTp2WL9PGYJDIA+f4uviDOUvpEtwRKD i4u+DXqeeJWXg4Aiz6LBd5MQsWiVr/BKSAOZnZU/e3HFzOZjyy7NnLjm8eMG8Ju5/2/niK/8Ju9 LSO7B8dwVEAUluncy2IcJOWmlgHg3M0ETT7hEQPA162p5duass46XFlm3Ueinn5+56B7Z0Y2ZPX uGluZKBnWy5yjgHDXzeBLm4Z5d3M8Bck5fID X-Google-Smtp-Source: AGHT+IH9TQuJ8S6VwCv/DsUwUueSrMwmdIaON0G+tCnVqhp1ubDleE7CO0HW5JVWQ93mm1BDZ5rH1g== X-Received: by 2002:a05:6000:18a4:b0:38a:a043:eacc with SMTP id ffacd0b85a97d-38aa043ee63mr16034591f8f.1.1737038967915; Thu, 16 Jan 2025 06:49:27 -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 ffacd0b85a97d-38bf321508esm70310f8f.10.2025.01.16.06.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2025 06:49:27 -0800 (PST) From: Tudor Ambarus Date: Thu, 16 Jan 2025 14:49:06 +0000 Subject: [PATCH 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: <20250116-qcom-ice-fix-dev-leak-v1-2-84d937683790@linaro.org> References: <20250116-qcom-ice-fix-dev-leak-v1-0-84d937683790@linaro.org> In-Reply-To: <20250116-qcom-ice-fix-dev-leak-v1-0-84d937683790@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 X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737038965; l=939; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=Wje1BciONDqQrKQyhp/R22j+9s7pjT1C1mQYS4XxTmo=; b=aMMD3l+fSYmaasELHSb630GvEIX81VeJMVo3eY8nHViIArWh5G7STBR9Qc3WZpAaFDvitRjk8 m9LNmbtOIdmDxHTkSnPmHvYOH/JFRZpvuMIE8UrP0vRAQpXFltqIOPi 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 Acked-by: Ulf Hansson # For MMC Reviewed-by: Krzysztof Kozlowski --- 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:16:26 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.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 A403522B8BF for ; Thu, 16 Jan 2025 14:49:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737038973; cv=none; b=kOIj0P4wsrJdfDoZLzNSfXsXuiC+8pzqBjcLeGwXy/h6VkbTFdY0398GRb3dI/94iJEH1m4rG6S9UISxwm5klLXflmMNtJ4sjzh1BvJoHordVsZ6UBJVjYNnfUDex9IKd6Gxs+3PW9sF2cWWy5oO6DLUO/rpu7uJAk0QF338bVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737038973; c=relaxed/simple; bh=mMqcSmFFvw2TkkbHF0Z/tBSpa/sSu9tnGHtQ8tATY60=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cPR6UFi8uNwEy11E0VGUexYGZXFeoIPMdk0qmXSJlnfFuWkABHpF5CUTddnC3xzgx40nYwfGhKWzdsnfAb4BmMe6+lz23XzeMd4gevXySDnBnCB448QUFqMYiE2QuQKetLI3ppt8whqXEDzYFqeCS3+dQ4jz47bTQBJZMvMVc3I= 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=klpmnC8R; arc=none smtp.client-ip=209.85.221.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="klpmnC8R" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-385e06af753so565288f8f.2 for ; Thu, 16 Jan 2025 06:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737038969; x=1737643769; 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=3VDvVHb7Hz9aOiJJ+fFlf31oRvekJW72ufAgH10hVdw=; b=klpmnC8Rc29mih5tU+C64KE486W9gvyUUxMcSb97BRBkhino/vFeLzUI8xBK0L38PU rsDc0fEadxBOI8D7Lsi8p3zd7fGZ9LN7/zPnEXYFG80/3km/cFgrMoNWt4dcqTUoauLM fIt7I8wSz+iOMWpgpjGWqnBLUYpQ2gELlTV/rJaG9XNdx3hp8Zo1XHdK/E6RbcGimMsW fsNpZlE4YpPp89c8WycXOK7qeqeui/tGTxRT+5CqSwF6pnIcarc1gQ0+1Kg+OEJyQG2D WpbACsVqQz9XusnUwJDRTQAh1iqKXCKdhYvniLrFnLVD/ylonoTL90TX9hJJ4sbCZMte UWNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737038969; x=1737643769; 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=3VDvVHb7Hz9aOiJJ+fFlf31oRvekJW72ufAgH10hVdw=; b=AdDl4hc0Go/aB2dn5NMoasaM5kdTEkMAJpbuONnoVcHk+RRhWm/W836sbi6080e+/V fLtkb4L+lBFeidbAymY4M+5xJP3T1sxxeS0dsLv7VTg2CiCt5Gyg48JLrIQ/NGXlvyah s4WrkaXO0IYw0fXZcIZT4Z98JX3k1a/z6wYhJGLFA2LEmSm8qEqzGnwlymT3yj0xssNH ZtiB51jYw1QPLhIZWJ+SzanybflglTW2EZBc/9dAJGnIUW2OnpEskjkxPo5fE90XY7af 6uypkm/RIRs25HEYgoqwXIOd0hfleHxG5qwtNoBGAZcWK8SQppBSuDwLx47khInZmvmH ce6Q== X-Forwarded-Encrypted: i=1; AJvYcCXZd0zLalhvhQChzwV3f6bY0d15sChBoeRQN1y5j/OSxum0UU/ofjt0LH/F4yVpA5bLddv20vpgdlYbkIE=@vger.kernel.org X-Gm-Message-State: AOJu0YyuBDcGtoP54BRYqFQ2wOo4eMDx96RA/at/C0GeTjjgBxzyXnKu v6AFsg+O/9Fje7Bqq4TNK8k4YMGDe9Mp77+rU36IhVDOUldrxcjYW6VSkeXQ0cc= X-Gm-Gg: ASbGnctiz5613J3g0GcpUgNLHcZPooTL8r00qfKRk5LrvQcB747F5rYKVJ+6fioaKCb RngxQ8BG1SlKb3vOn5PuvqtGn1bJ4xPblyzbXoFysQbLw9E4dysAuD5bg/riZanMO76CtKHCs+9 NfMAj9d6IpGt9FJd0CN36EHEkdaj83ChwTvMsxsRAZuV8aDVT16Ja7tbfBPMZyZguV73CRM/BCU 3cyWBGmjBVy6PBSJiHowGwWCjaLIf4u/e0LyHGGyigJPUFu9qWP0R8q9mBglUrGW5vSwsMy08gk r0/Y6ma6sUMU5U+zKjYumNVCWee1jYWW9wG7 X-Google-Smtp-Source: AGHT+IEYjm37I0xC5oyYW1bza4Imter6m0Ap3ye3A3KaXLIpUrnXkIdWfDmQraHXh7LXwIvTqWenkQ== X-Received: by 2002:a05:6000:1862:b0:38a:41a3:218 with SMTP id ffacd0b85a97d-38a8733899emr28060936f8f.36.1737038968835; Thu, 16 Jan 2025 06:49:28 -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 ffacd0b85a97d-38bf321508esm70310f8f.10.2025.01.16.06.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2025 06:49:28 -0800 (PST) From: Tudor Ambarus Date: Thu, 16 Jan 2025 14:49:07 +0000 Subject: [PATCH 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: <20250116-qcom-ice-fix-dev-leak-v1-3-84d937683790@linaro.org> References: <20250116-qcom-ice-fix-dev-leak-v1-0-84d937683790@linaro.org> In-Reply-To: <20250116-qcom-ice-fix-dev-leak-v1-0-84d937683790@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 X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737038965; l=881; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=mMqcSmFFvw2TkkbHF0Z/tBSpa/sSu9tnGHtQ8tATY60=; b=ckw/p8Yr8OAqf94ouXfHUwYbbzLskOGYomyFslWm+iFcOpDzJC0mlpKDWKk8wbQ91TJMNb+5E nC9f+glXfEdCGF3iseCm7YkfK5PJU3TI7PKc9l6rqwoy5fHLepwJFWH 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 Acked-by: Ulf Hansson # For MMC Reviewed-by: Krzysztof Kozlowski --- 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:16:26 2025 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 7A64822C9E1 for ; Thu, 16 Jan 2025 14:49:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737038974; cv=none; b=Cxs/SNlP+0Dh4e+1jGY9LBMG8b8JlwCXbnXQohNufhoWmX2+X4bMeAzJd3NqM6Dnu1PJ+PQEcf5XLeLSvU5fumHwyv+c2MoxPn35VpCodOASIJIrpuN1P2620ScKpfr4cqYk2vYaXJI8mQvHKkxN2rixZufUz2z3v4hYcEzM+94= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737038974; c=relaxed/simple; bh=SLPk0X7feJzjbp6iNB5msnLoDstFDxW+7yuOzADYOIY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=G2XNSiEhLFrSS+L2/u1HRI1oT6q+3Jz5eBs5tBX8si9oUrjb9NQhOQh7Th2gMqlBgTjHxmgAr0zjR6U3F+FE41siOM1VHq3XSC7OFkk6zasIjdCCUkraj6donhW3TNUm5J6BBuiYbTQl4q3RNPGftwJ3L98c5JlLObrd/0fIK1c= 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=k+paxNDI; arc=none smtp.client-ip=209.85.221.41 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="k+paxNDI" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-38632b8ae71so825217f8f.0 for ; Thu, 16 Jan 2025 06:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737038969; x=1737643769; 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=e7cRMSVWB1iA1Z/E9hbzESrNuj3mM1/u3MbHi16H2W4=; b=k+paxNDIjOxDJgPjAQG1KtidazknNY471iVzSHZQNe6EgPboggEra9/7VcAlUw7/o8 fY5tDLXNNxoIfYERctcld0qybKoLCBy5gfdMaWR2LpefZTo6J+Z9ytcHocx+O3VDxInC 3mqZxcLEemohTrWZBpxHrbvB8ONTmm4gUXB5vvzEr7WQXl6ESFPiuc/U2XhUZRLI/9bS IPm3I83AR8ub4NYD2Z8WBUJN+aoZToBv0cvpiiNvGzhH3d6zPrEGQGFtaZt30uHSYO/9 q706kNsf99ulZQCS0aOYibKgTuvitR7LNS8OblVZLa3PkQLGDhGcu78k/OzPWbIrgbeH u6qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737038969; x=1737643769; 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=e7cRMSVWB1iA1Z/E9hbzESrNuj3mM1/u3MbHi16H2W4=; b=JKN4W0YByHuM8H6w6jl8BxXwHeX0iS8Hegqx2v6L5E1AH9NM7B1j+QPU+pKOKAz44P 1nJMf5W7zpDAytfDJVH+tjc0lIAO1Xaq8I/lImpw3+J+Xz9vO+hgyLoPP1V4XIKxqsW3 BZoK6nuw+jrKuB+Su/pjvk54n2oqR/w+G0+oew8J2mduwwxCNiGsr2fVQkOQusj8YgfE gVrzgdzwvRlDJQeza3ogubfhb7AhIlQ+FrWHkqc30N14WkqYwCjZYwlENyGZg+zobcLZ Vb6lYCsEOTgohRz5VkmAzHY/i6ca7pPvreeBckjBXL8YWTzxg++f8Jn3JSKJO/qzQAOA lgqQ== X-Forwarded-Encrypted: i=1; AJvYcCUr+VLmvXzuMfbHKQKVkqaqmGIOzNtXOq2yAYNNCYC1NiVJ1xnRtpyeHqCOQ6V1DPrY1WrgIwnKqJZWVmk=@vger.kernel.org X-Gm-Message-State: AOJu0YwJfXNjoGaRfff+PScr1F1B5hA4OzA9rrpjHyMig1xCwwHPnbHt gTXAGqnKibcAquZw7lt9/GnRP8OCB3sFBSbIEwF61vbAWf6XHjvbJuNnl23FXg4= X-Gm-Gg: ASbGncsq3CET+GV72dWtQA2QYccrlOpTXpBRvqc/eLcqtdKzBalqRr7MAzfuEr9GKRw QGNakryx6FxTcv0gyM1llCGLa/6a3XpmH8DAJepY/w3X591vhIYh6UOBmq7ThDQV12zSWrPtQoM 9VqsnwDSeoKR16zQlyv+SlA36USS7KnfyW2PDtD90/K8Do4yirVr63JIRJ6vCql3DhOJyxytEto /nkeHoz4s3Zng8MkZp4sMpmzgYRH7U376w90nrSMXTvsuTsSFHCSxkb/sKG3xQmQ+CoxfH110cH ckfIMafwO0E4Tpx3PK1DUCWZ2M4JgfW5PPW/ X-Google-Smtp-Source: AGHT+IGuLmvbYhQXQ99Ngdjm7P7XXhs6Xz5bChZGEdZB5e+12utWg4WoIKuw3R2n6RN9NlrJ92GEfA== X-Received: by 2002:adf:a3c7:0:b0:38a:88d0:18d6 with SMTP id ffacd0b85a97d-38a88d018dcmr19384870f8f.42.1737038969571; Thu, 16 Jan 2025 06:49:29 -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 ffacd0b85a97d-38bf321508esm70310f8f.10.2025.01.16.06.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2025 06:49:29 -0800 (PST) From: Tudor Ambarus Date: Thu, 16 Jan 2025 14:49:08 +0000 Subject: [PATCH 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: <20250116-qcom-ice-fix-dev-leak-v1-4-84d937683790@linaro.org> References: <20250116-qcom-ice-fix-dev-leak-v1-0-84d937683790@linaro.org> In-Reply-To: <20250116-qcom-ice-fix-dev-leak-v1-0-84d937683790@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=1737038965; l=1554; i=tudor.ambarus@linaro.org; s=20241212; h=from:subject:message-id; bh=SLPk0X7feJzjbp6iNB5msnLoDstFDxW+7yuOzADYOIY=; b=G8iEARZbH9wv6CQbJi1hOS5u+HYxxskB3G6McP5l6dHKR3FG9vTnp5n4BD0jqXTdLl4BSdAzC 4JF38mDEPEmDQ7SXoKyDlewZGuD6XTgwZIpVqagkG1RWcJfa0FQRTzo 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 Acked-by: Ulf Hansson # For MMC Reviewed-by: Krzysztof Kozlowski --- 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 9cdf0acba6d1..1a2f77cc7175 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