From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 935A13FE36C for ; Wed, 1 Jul 2026 13:39:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782913159; cv=none; b=egLQTx9pZMlVqhl3y9Eui7pwcjEpMC4ITKyKUEZYzhhhjqTyt8icGLErYxjm9AgudqS3PgsB/6nCqpdWt8iRiU6/KVm9fPmSCjeRSMSX8tQCuHvCZGR2tl4O4sI6oU62KWvoMvXPT4Ud195rk/c+RH8jnZp721kRva+PsrGM1QM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782913159; c=relaxed/simple; bh=KzDYfcp9GnoGvcZEBjshMGcErl+HkiJ8eraZlbOE1Rs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ea8ZwJ6zuBDsJ9YIKDWRPIU24lmEtiv36r/bJ8DmtbkOvbCzL7hjTWYjEi3gFM1acKv6z0FitnmpW70FOTrVUmVby3mp3aYvYPjAXhe87FPI9YQ0beN9awrxbK7o6AWbXJYZQit7M77AVEXfi8I0Ds1cWtyVix4U8DbGK8LhB3k= 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=bJoJiUFL; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=KMcEDzab; arc=none smtp.client-ip=205.220.168.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="bJoJiUFL"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="KMcEDzab" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 661A8uFv682009 for ; Wed, 1 Jul 2026 13:39:18 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= nJrOhR7snJODHa4LeONjJItuEyxiz/64Tp9ZjkYxfaA=; b=bJoJiUFLxUO0cT29 5voRtmptf3xHEXNlVr0pphqSepVmukfmiAWUGOqAilF+8rq0OckfUOdEh1ftZpXo Edf9x9XA1FuEjt0NGNTHyxJpjCXH4NZt+pWWIKze9+XoQTeRSp3HV8hsZRuFy0MS kVfw/gI0g6v/p+MrmpUf/c0ic32lxXcL8QX97W0jNI9rcXA5EQHPb/W8bRP3QydE bu3cZAsUG4Y+/xii04TfvnHe9jRcsvFVZKfKLc3ylPPbcmgTO++gDEuCeSN3k/y+ UdybbYTVr6cW9pIeZCGVvfe3RvAmYhylujQlU/R8G1lgtpUP7Sn6aaxDJHlYCIDV UADSsw== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f4k3smfas-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 01 Jul 2026 13:39:17 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e53b8a302so72914685a.1 for ; Wed, 01 Jul 2026 06:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782913157; x=1783517957; 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=nJrOhR7snJODHa4LeONjJItuEyxiz/64Tp9ZjkYxfaA=; b=KMcEDzabkb3BvjySozyv6DknZ//v+RNMKEQ/bZd7O0QZ9UGcICqwx19QWjVdsdcWZl wkYe5f71hoRc5fjK+FI4Yixxl6MibG7gtkU228PHTGvMVZejoAVlwLj8qPWynnvdDLjI yvR9r88fGD93G5tB6LYsadUgJhUFHcIShL3fYEes0qGQBmjRT+zARB3VipH2jYGgBt/E 4izNBT3dIk8aw+vAeMlg9pneuHAvAd63U1/tMMay/NYx0eFh/2k40VKDCFJi4WZX3ktl 6+2UaXKBRHyBP7HMf8sVetkAIodceeoGGweaB0d1P7KVa15HjA/6jzRFrFlviRn9ARh7 VRTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782913157; x=1783517957; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=nJrOhR7snJODHa4LeONjJItuEyxiz/64Tp9ZjkYxfaA=; b=NDOuck2hMYV2uV4WgNgVsciXCwOiKII1mftjTC6YPfdPVScj8wHAklnOgJJXZI7sej c4RCctbYY++ocFVwcHIAZirDNIzL49/Dcn8IpwfuzKdnxjRCUorJOq3RUAWXvKZPj/TJ EE4Iynn1Kq/B6WKrMnlZC0qkwOPKN5VHFfZlfTOQxvH4TVPrE/2yrsYodV6Tcmxxs0nh wLDT1SFujdfsTtP8jSUlu5ukdi+Y9bMFxB9vPqLtMARK8EOY30SHiDf0Blv+Zn5jR/ZF hlIuyX07MgnVZTpBOf27mGi48ieM4UidvUNzPFBq3t5QEdR87mv2Wk7lp3Hwxe9eNilF MKHw== X-Forwarded-Encrypted: i=1; AFNElJ+n8jDaFaQnPGUG5wekizCas/cE/NramRfChBZP7dFMMpL+Om0sJ6L3SFdwZU+errgYkUgAWW6Sd9gs6ZA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2LUdh/XRgglzmIGWzy+XZ8l4H7u131pWesNf5Em5qTcwdu8Vl lF/dGwSmEytAqSlQkaFqCNfrC+3/SAY+2HICNHXmoKZ3pKgVpnIYVl5EIHxT+x/yzj5YeGK6a/q TXcMzgntWrqFWmLDKeWeBvTHUwtgzXvOclWMwwzZNqsvhqLAyqDSGQBCRpOo7M//Rp2/TNRehq4 g= X-Gm-Gg: AfdE7ckpcyI4+osMq7CRMTvB7/NEtpnl8w7kQGzFynCZ3ZBMGDCrzMZ03GbdbI3TFvd VDPFqWlJ9VTNOBLZVlkfz1v2J6LwgfxCX3NR6/Q4GNFRgyz/ZGEyKMhqDN03aSChgdzyJp9P/dM KbIh/iexbj614l4D+Ii/rScqaELERpora4zmMFjIzusk8HIckYbFaDpR+e4Q9PFHgedPkEQoWb9 As924mILqd+dQNL4AT9PbCBngrKtztadNk9MfHsVIPWZjJet/hi9VKS5zPucFiH9FRUuNHsSr1M /T6YIzzw8mPNX7L3Q4Cc62Ao5wlWx/GzlndJKDPvSD/hCExLgV8SCuUyN2DX+xiYdRbTqswyAC0 2uarwEOBhZJxNE5qmP+SpXIoxKlKgDdBFj/OKu21i X-Received: by 2002:a05:620a:1722:b0:92e:5d19:bf82 with SMTP id af79cd13be357-92e78217191mr242033385a.17.1782913156735; Wed, 01 Jul 2026 06:39:16 -0700 (PDT) X-Received: by 2002:a05:620a:1722:b0:92e:5d19:bf82 with SMTP id af79cd13be357-92e78217191mr242028585a.17.1782913156275; Wed, 01 Jul 2026 06:39:16 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:6619:ec60:6996:ac02]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493c3874f62sm18349985e9.2.2026.07.01.06.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 06:39:15 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 01 Jul 2026 15:38:55 +0200 Subject: [PATCH 1/4] firmware: qcom: tzmem: guard against IS_ERR() in the cleanup handler 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: 7bit Message-Id: <20260701-qcom-scm-code-shrink-v1-1-02f5ce02c95a@oss.qualcomm.com> References: <20260701-qcom-scm-code-shrink-v1-0-02f5ce02c95a@oss.qualcomm.com> In-Reply-To: <20260701-qcom-scm-code-shrink-v1-0-02f5ce02c95a@oss.qualcomm.com> To: Bartosz Golaszewski , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1033; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=KzDYfcp9GnoGvcZEBjshMGcErl+HkiJ8eraZlbOE1Rs=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqRRh8O2M7m5URuKEsukFih39DWmQflnZYkqiW9 TX2hxbY77mJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCakUYfAAKCRAFnS7L/zaE w/pPEACXsOEVrhmVbL9j2ZtxZvEe+SQQ4mLOUsVicUc6r2+of2twoWmT44ZrFJe2QzGo+IdL4qx PfnIHEVGatH+un1qwHsCmTt61ADzycZNar++w2QJPb/vf80AjgyZkUNSDQmcnKKLqzlMjYI3g7d 9pAsTC4tS/Ba6p5I3rADRg3qQU5Hhs8Ud7fYsZguuBZMmH5lrWQDk7y4tPBUwMzDk7b8oodAcM1 iNEL0vdsbrEKGNcw1hju34nlVYPAHdMmdbXLXm6sLZkffkXR6Ox721uip0C/WxATCuRbZ59WrON pOJs8oNvul5uaOD0HGdkNJy0ZekYAnA+Zww//aC/9gbnrxUg8A68NwXJNQlHXkFjPGBrYQoPOub Xc9R7Yt8LtZGqOn0QVfabYVckj2PaCcvC0uyP62wGVaKgMySNecRbNS57Nz134TkTHL8D44Co9s 4UUV5NwsD6eGcFsnOL44LClaTs1ijelrpg4rTzK0h868ZmHEKL4HTRvIPbdTIPz+7ACSuUkM3S/ XJVQrP4T0W+76VYNks/6jrxHHcz1AzpXCa9pgWgtBZDIHEKcpikP+wd6ORnBiuWWW+fcQvkC2Io wxydIbal0u4raqxL11Bb+2cBOqUu4Ua2BtOFTdYNqnY4vOXKxSk+nwqlew6mYonM380gGlWa63/ emiqw92XTX0xs8g== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-GUID: RKG3fWViW1OaH8_U-FtScNY-ZPeN7-RA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzAxMDE0MyBTYWx0ZWRfX5zEql5g34PDb 6YCMqVLsmSgxW8nyt1eobOth+cfU5YyYDRamsnsE3++CfGWpMPWPOuuyUeAfriak2tTyTGESck5 SdsXiRThCIMFPYfpPZKEpbjhEOkAG29c0Oef85pDCRyF0g5geqMbCwNUjksE7G+fVpNIBfh6hs3 M732lDtsZTA9wupzPpDIug7bG4y2g5p1lGm+J7jE1L5QF0yLYVBWe4YmT5RbDawDp0souqTRQh0 Kg54FDNLngse/UGUZQxytAuixmFpM5IUhnbs56KFxXoD6dc7dz9Tr6m54kZ13nalzA+6DxS9jdZ FHbP2/I0o+Enk4YWlCwGjlOKaTZiEqe9ATYzExvjYRPqXOxFc1IEFNUZ85IXeWq1kSFQJK4WA83 3+7AqWDJlnEuHAz8emNMxo2d5UojzWgmyYY02Z2PhPeA2hKinSLRAytpxYr309UGpBeRxbgSJ50 3ET1kt9GNaAfVl9IeWQ== X-Proofpoint-ORIG-GUID: RKG3fWViW1OaH8_U-FtScNY-ZPeN7-RA X-Authority-Analysis: v=2.4 cv=Ff4HAp+6 c=1 sm=1 tr=0 ts=6a451885 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=PGwebHSm6yYtckILb5AA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzAxMDE0MyBTYWx0ZWRfXwj4k2DPPMk+3 5lpudYMprv0wrcQ+MZ6RVjQvcCwJetfTOWDuyIsWga1w9dV+FIM4MVEn/hm5INoFeRXyimHZrPN WULEI+Rur+ezHnPjqFNFsJVNMj5UeHI= 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-07-01_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 impostorscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 spamscore=0 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607010143 We currently only silently skip NULL-pointers in the cleanup handler for tzmem. It's possible that we get passed a pointer holding an ERR_PTR() value so skip it too. Signed-off-by: Bartosz Golaszewski --- include/linux/firmware/qcom/qcom_tzmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/firmware/qcom/qcom_tzmem.h b/include/linux/firmware/qcom/qcom_tzmem.h index 23173e0c3dddd154dd56dc3dcb56bd20ada0520a..b5520178bf6f53b86b530571a3be9f302225f022 100644 --- a/include/linux/firmware/qcom/qcom_tzmem.h +++ b/include/linux/firmware/qcom/qcom_tzmem.h @@ -58,7 +58,7 @@ devm_qcom_tzmem_pool_new(struct device *dev, void *qcom_tzmem_alloc(struct qcom_tzmem_pool *pool, size_t size, gfp_t gfp); void qcom_tzmem_free(void *ptr); -DEFINE_FREE(qcom_tzmem, void *, if (_T) qcom_tzmem_free(_T)) +DEFINE_FREE(qcom_tzmem, void *, if (!IS_ERR_OR_NULL(_T)) qcom_tzmem_free(_T)) phys_addr_t qcom_tzmem_to_phys(void *ptr); -- 2.47.3