From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 976273EC2D1 for ; Tue, 30 Jun 2026 10:07:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782814057; cv=none; b=WJOZ54V5dZ2qlLnBeVsZnWwla71CNMfV/YC33o7I/0kURiNsWaSe4Mp8l93tLmQc+XqHaeMWOE0slebEkSW6rZIsYNDMyiTDjLuA00bp5BIwaNQlXzYkRNp9O0xlOXA+CMn8EDeGOxB7m0hzz0UL7XYBiMlLreM5sAp65KtSmJA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782814057; c=relaxed/simple; bh=oMLy9f5ov7nQ54i2/cX9N1jmgjm/2oYPTAamP3S/Gfg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=EJFWpD9X8HRLHa2+KNu04vs6yY1rOxcqFx5I22rZdHq4rH/PSn4SaSBLc0LeDkyFZoAJo+DLB5iRYol7zE0WAJBjUwvAGOHjVISmUaUrWwDCVRvU7P4lCIGBY4BQvZg2XfGMs06v4k4337msNsSmzQRjUIpEgu0nQBvID4q7mvg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=MuTHaB32; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=YxMlBEUK; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="MuTHaB32"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="YxMlBEUK" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65U9n9kZ1605952 for ; Tue, 30 Jun 2026 10:07:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= uJXkLtGwrSHNE3iUw3p4RQuRvGoBPC66zF8s3Wn6sdk=; b=MuTHaB32pQHZxDdG Uk09Twu/MdLNoQobpYkQSKjt6pSAHvqwUEHSW60AWJrgJ2tLZYyYRgxHAvcRxYTI woZaqFuI/dK39FuHDz29kGgm49qS43k7yWUeauyjRbAToZkD9CZEhm0TCFBt5PPi Lrs3x/6+ZYUoCwBVWy42N377M4atgkkj0K7ZotJDyDU5EcbTQPvk+NJkY3fXDxxa eSg45BzPfuSuQ5iWyj/wTrnmbJTpo/kM9spMQsepCUmfvhrf2l8sC13aHYIkMADm ObJatvFgfAzstFVJ4CWSvJXNmcaR+JPshvNeZgHBb+5GW/cS4ITnGxT+9AyCXZOH vwcgQw== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f45k5sqrc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 30 Jun 2026 10:07:30 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51a8ee253caso4866161cf.0 for ; Tue, 30 Jun 2026 03:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782814050; x=1783418850; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=uJXkLtGwrSHNE3iUw3p4RQuRvGoBPC66zF8s3Wn6sdk=; b=YxMlBEUKJXC1h/aFwBvqE7LvyKDglKzW9d0SFyDTMuT0IQFucdE5n+gHTrjI/Zfyv7 ZrQQvzxV4cImrkZ17BU1j9Bijyn2hdZrMzyQjD/tJPXq2l97/dnDSzLZlA2tA2jzQhea WlR4bffNi2tT8koa6bLoLQwEAMufT++ArMbtE8glQn1raeyD2mSjwyP3yNtcaqJjiNjY BsOJHJlvWn+r+o63/yRiCmbNYY9rEwCFPbs0dqqup8bexDnK50s2Gvxtqmhk6MCerb9+ rRTUnMfV8Nm5SDRgltXEhBQfjev/8n3g7kloxMG3vFgP3uopzvq6R3Arj1oSjANHXYgA vPXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782814050; x=1783418850; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject: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=uJXkLtGwrSHNE3iUw3p4RQuRvGoBPC66zF8s3Wn6sdk=; b=NRZ9sjUpMMg0hh3LSewFVG7nkf7hTM3edBeD5F+fLzab69YJ44PkrtfklolO1ha0gG 050eKaBZO8IJaem8Jq4vyioIkxHc4sJUv4gN1GEq6/BvkAiHOLY4hn4MeoO1aG30xlUM yoJTn+DRXkJO0s4vnYv/SqSVVn0+r3/to753q0Rt26mpN5zPLbpUBNsARQXXzq+QH/Ca q/XS6mHtBXeIowQuF5MwoMoUGBLVxUb87qYG5lF3FHwxx4JMtz+0kGDaZfci/KyM5UjH Bke9aRlV7UTBFm8O1cwBSrgwMvxVqYJtUxwe5x2CvSz/hdHkyTxoEh+F/2bIhDCeQaM8 P2vQ== X-Forwarded-Encrypted: i=1; AFNElJ+V9qLlEfRXNqmV5JQJOaa9TCsKraIdubs40fOVj9KQGrSS0KD2KvGRBiYjK/cpphY3IYdLk8+JioH3w4k=@vger.kernel.org X-Gm-Message-State: AOJu0Yxt136qaD8yPPqUZCc5KdFbx5PqEhMHgbwze5ln+x2kC8TF+Rkl f1Vq8wnF6p6S83SpLN4UCw8rkvP99Kyg1Uf8CJD2oM3ieLVe4WmsacFJi3PWxe3GKMQP/AxhNZG E60+6dohZ8e1v3GrLShhcnL90E7OiKycM9W3VVJD5j3wDl/oKCbOmvTpSE5YeeJn4wb0= X-Gm-Gg: AfdE7cm5JP3iEdrGvny36whc1E5fjIB0ZM8vBsGk0uInC0X3kn3KT/NjqM4xtk3CgSY l1d+wTnTm73J/ch/DdYnxaeVSAGLhZmpVFU2bWTd5R1x3PjbMB/tUSB+g8uoEh41pUH3TAYF3Xe pAa3ifHSvzLsZnGQu00nFalyHfhLo59JQftKx+sJM3rpfxHVipvoTLjD6Y58JLmVI8oig/9xVCc n9toN9mKjgSEulAZ1tSD45OrT8fqE42afIYIN7pL8FL1dPka4CT99nDGwlkBZ7W27LAU047ITqV XqJxTDvro9amgaGF/z4kO7WwwCJRir2771UzswY2Tm1JukMRkeqaDhT4g2g0a+F2g1BIXoBnJBH 9bbg0eGgjO/s8iWZ50+MpGlu7bzuAJTznN5I= X-Received: by 2002:a05:622a:a1a:b0:51c:1744:edf0 with SMTP id d75a77b69052e-51c1744f08cmr8810581cf.9.1782814050091; Tue, 30 Jun 2026 03:07:30 -0700 (PDT) X-Received: by 2002:a05:622a:a1a:b0:51c:1744:edf0 with SMTP id d75a77b69052e-51c1744f08cmr8810301cf.9.1782814049619; Tue, 30 Jun 2026 03:07:29 -0700 (PDT) Received: from [192.168.120.170] ([178.235.128.140]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1288f47394sm97184266b.43.2026.06.30.03.07.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Jun 2026 03:07:28 -0700 (PDT) Message-ID: Date: Tue, 30 Jun 2026 12:07:26 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/3] firmware: qcom: scm: Fix reserved memory cleanup on probe failure To: Mukesh Ojha , Bjorn Andersson , Konrad Dybcio , Bartosz Golaszewski , Guru Das Srinagesh , Sibi Sankar , Elliot Berman , Andrew Halaney Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260629141750.996853-1-mukesh.ojha@oss.qualcomm.com> <20260629141750.996853-3-mukesh.ojha@oss.qualcomm.com> Content-Language: en-US From: Konrad Dybcio In-Reply-To: <20260629141750.996853-3-mukesh.ojha@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Authority-Analysis: v=2.4 cv=AqDeGu9P c=1 sm=1 tr=0 ts=6a439562 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=PRfkaYvzSr8QmIIGAkY2Sg==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=u0TfFkBtaRxlmmFmf2QA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-GUID: 85v81gxypLMqItOEyVCuWNTAp4bzCjuy X-Proofpoint-ORIG-GUID: 85v81gxypLMqItOEyVCuWNTAp4bzCjuy X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjMwMDA5MSBTYWx0ZWRfX2N1LK0Z6EMKr kjHjr/Czah50GnE8mwarXKpZKy/n+bpnjemDI/g6/bXwUp4mToigIbzqRQ5u9IIweF9yXp9mB49 qDQcM0Z1jA81Ymt/vjZyx2YQ7ZmryMk9Pkl7a8QlWwxvSXF/FQZ1S/ZRpo7FfXAgvUhzj3pAeaB YRFd1awgYtRKk6LQoaxta3jksvrr58fTsK0IhrUcTwv5+QwGNlFvLFlfW+5G3RdQvJyh9TdvzQa QNm3YsW+hwCKx6b+xnbMpaD03Aq6yITQlMglEImRZWfvPFG5U+ia8+ZOFox0rTEoH1SSxLgEr8U nc1frVnv1seRYtfickMGdtQX5VVaPAvgPRXywuE0zkT1NtZxkKu9tqXyoG9Xuv+jyTwxUqGfqZa YreXVyZoWpyBUoSCwbLcU6BzV0di5pPG2ivjfqgFggZWjbIWOQT0MDfZd8KZ0doPn/zckUPUvk1 +ba4zQ45L+OBx6yAtWA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjMwMDA5MSBTYWx0ZWRfX15MLkbPuox7T 2iPcEhwHEzBUUEkqkceUjOadm56Wfc7Ixa8hTcAWp+g+n5TeqYILcaP24Pt2mQCVL8Kfi3Idmtm UFudX8bzzTteCnk8pIjwH+Npx9m97Jk= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-30_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 suspectscore=0 spamscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606300091 On 6/29/26 4:17 PM, Mukesh Ojha wrote: > of_reserved_mem_device_init() adds an entry to a global list with no > devres counterpart. If qcom_scm_probe() fails after the call the > assignment is never cleaned up. A probe retry would add a duplicate > entry, leaking the original one permanently. > > Add an err_rmem label that calls of_reserved_mem_device_release() and > route all error paths after of_reserved_mem_device_init() through it. > of_reserved_mem_device_release() is safe to call unconditionally as it > simply walks an empty list when nothing was assigned. > > Fixes: a33b2579c8d3 ("firmware: qcom: scm: add support for SHM bridge memory carveout") > Signed-off-by: Mukesh Ojha > --- > drivers/firmware/qcom/qcom_scm.c | 21 +++++++++++++++------ > 1 file changed, 15 insertions(+), 6 deletions(-) > > diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c > index 464ae3b4ca43..f0e19fc314b4 100644 > --- a/drivers/firmware/qcom/qcom_scm.c > +++ b/drivers/firmware/qcom/qcom_scm.c > @@ -2785,9 +2785,11 @@ static int qcom_scm_probe(struct platform_device *pdev) > "Failed to setup the reserved memory region for TZ mem\n"); > > ret = qcom_tzmem_enable(scm->dev); > - if (ret) > - return dev_err_probe(scm->dev, ret, > - "Failed to enable the TrustZone memory allocator\n"); > + if (ret) { > + dev_err_probe(scm->dev, ret, > + "Failed to enable the TrustZone memory allocator\n"); Assign ret = dev_err_probe to preserve the usefulness of this API Alternatively, I cobbled this together, feel free to take it forward (compile-tested only): >From 917c849fd21c6660ba0bd55f8b6ce4cb5dfc8299 Mon Sep 17 00:00:00 2001 From: Konrad Dybcio Date: Tue, 30 Jun 2026 12:02:16 +0200 Subject: [PATCH] of: reserved_mem: Introduce devres-managed initialization functions Introduce devres-based helpers for of_reserved_mem_device_init(_by_idx) to help fight dangling references and ever so slightly reduce the number of boilerplate deinitialization calls. Signed-off-by: Konrad Dybcio --- drivers/of/of_reserved_mem.c | 37 +++++++++++++++++++++++++++++++++ include/linux/of_reserved_mem.h | 25 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 82222bd45ac6..79fa04d4cf04 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -787,6 +787,43 @@ void of_reserved_mem_device_release(struct device *dev) } EXPORT_SYMBOL_GPL(of_reserved_mem_device_release); +static void devm_of_reserved_mem_device_release(struct device *dev, void *res) +{ + of_reserved_mem_device_release(*(struct device **)res); +} + +/** + * devm_of_reserved_mem_device_init_by_idx - Resource managed of_reserved_mem_device_init_by_idx() + * @dev: Pointer to the device to configure + * + * This function assigns respective DMA-mapping operations based on the first + * reserved memory region specified by 'memory-region' property in device tree + * node of the given device. + * + * Returns: Negative errno on failure or zero on success. + */ +int devm_of_reserved_mem_device_init_by_idx(struct device *dev, struct device_node *np, int idx) +{ + struct device **ptr; + int ret; + + ptr = devres_alloc(devm_of_reserved_mem_device_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + ret = of_reserved_mem_device_init_by_idx(dev, np, idx); + if (ret) { + devres_free(ptr); + return ret; + } + + *ptr = dev; + devres_add(dev, ptr); + + return 0; +} +EXPORT_SYMBOL_GPL(devm_of_reserved_mem_device_init_by_idx); + /** * of_reserved_mem_lookup() - acquire reserved_mem from a device node * @np: node pointer of the desired reserved-memory region diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h index e8b20b29fa68..28beeeb91f4e 100644 --- a/include/linux/of_reserved_mem.h +++ b/include/linux/of_reserved_mem.h @@ -47,6 +47,8 @@ int of_reserved_mem_region_to_resource_byname(const struct device_node *np, const char *name, struct resource *res); int of_reserved_mem_region_count(const struct device_node *np); +int devm_of_reserved_mem_device_init_by_idx(struct device *dev, struct device_node *np, int idx); + #else #define RESERVEDMEM_OF_DECLARE(name, compat, ops) \ @@ -91,6 +93,14 @@ static inline int of_reserved_mem_region_count(const struct device_node *np) { return 0; } + +static inline int devm_of_reserved_mem_device_init_by_idx(struct device *dev, + struct device_node *np, + int idx) +{ + return -ENOSYS; +} + #endif /** @@ -108,4 +118,19 @@ static inline int of_reserved_mem_device_init(struct device *dev) return of_reserved_mem_device_init_by_idx(dev, dev->of_node, 0); } +/** + * of_reserved_mem_device_init() - Devres-managed version of of_reserved_mem_device_init() + * @dev: Pointer to the device to configure + * + * This function assigns respective DMA-mapping operations based on the first + * reserved memory region specified by 'memory-region' property in device tree + * node of the given device. + * + * Returns error code or zero on success. + */ +static inline int devm_of_reserved_mem_device_init(struct device *dev) +{ + return devm_of_reserved_mem_device_init_by_idx(dev, dev->of_node, 0); +} + #endif /* __OF_RESERVED_MEM_H */ -- 2.54.0 Konrad