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 93C00477284 for ; Wed, 29 Jul 2026 15:57:07 +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=1785340629; cv=none; b=KmoP5tw5sSq9Pkm6kk+/nZxbXK6kfiSVNVqEONGx8Q86nYMP/WQk2AhgN3uv5owhf9sWfqMZoALSFE4gStXBv0hnxl5proJmUU1mvKR1sFMnYoUwWHNWROuy71FF7n3kLAnxwjk7K/sPsbrnAfHqEnLXN31z0Illoz5n16yex7A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785340629; c=relaxed/simple; bh=XuWvQmNP712Kb9HIW++bTX5xsDuLuiqi8rGpIAdzbO0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WN+kLYeN6vQBnZurR4m13LkLQdBF9hGLh5hvcJ3jUwy+u4uNz8tmK/L3L0ig0GeruQ2g27mgeaiRNtA/B4dp0nTc3bySgYFkVTIaGqee1fU+7jBvKBms13Hc+uNnagTgqZS08zhAicVRbwYfDr8CkAkvwCjksa2NRSynm8fASI8= 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=i4NB1F1U; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Ev9yi/YC; 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="i4NB1F1U"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Ev9yi/YC" 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 66TF3Gdv2108268 for ; Wed, 29 Jul 2026 15:57:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=Ci5a3i1KHTi GYmRN5tAXD+AHcmxzUAUAXBR1lwdlYe4=; b=i4NB1F1UfAVUYHKl03lQVOqD1Rk oLB+opu7ZPiRCAPzai8aAZxHWeQajb8cTccGO935ykfNar6X+vamagMjGmPJ4AsF e7N1BzvQYSsp89d61+jszhkU86MW2aNhGHIo18YPT7lPvs1Aup2GVAQ7UEaamVPs sQ4HWya5DD7KE4fSNZo+GoUyQ6gXDvHR5sGbmOKhqZsfHhBlgUF3Wi0ooNeRBlxt 1+Rg8wmuq5H7evgNhcwiOUJxbGSM1QuV9kC+t5KW/1PDx61o2kcLJANqBzJgRawg j6wrrzZVpIKOMdsEYkS3hCt9p7VzXk6Xe7gXA0A3XvhwGX1cHbovNohQsBg== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fqkds8fxu-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 29 Jul 2026 15:57:06 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2cc86a9ef97so22065875ad.3 for ; Wed, 29 Jul 2026 08:57:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785340625; x=1785945425; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Ci5a3i1KHTiGYmRN5tAXD+AHcmxzUAUAXBR1lwdlYe4=; b=Ev9yi/YCOsoXH3yRohqSM6mZECKgL7FybEtmYsV3NiZ79A8c8fZcqtq7pYBBD1MBrH qZhX/eupHUU29bmFsdFBKtp3NDijcJU+05reKwX5LoQWJDMqutjRcc44DglDAtDNPdjb oJ26Mj4y8TdHyiKlNcRhKWYl99yntwtigDmwFCOstQRa/V1AVVzve2SCHhcBQOZov8eK 7sJ6pm370Pwt/VPeytU5SHbLL7hILTRve6rGsBPTXM2uBceLvHO4MSTTz2JzG8eOt83G bMwGqaNaTUPJ1LgRUL/T3kPDkbVPp5ZmA0w9cFMbU4VhaXSshyD2MAsv4TNwGccE2Bs6 cFlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785340625; x=1785945425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Ci5a3i1KHTiGYmRN5tAXD+AHcmxzUAUAXBR1lwdlYe4=; b=jrQ/fawNsHSYlX9K7p986Rj1mIzJPawnmkUAij2fTzUcvjSL6DkTDrUl1L1DMRYiuf IVtK0QNMyxVn4131T6J26vTnJFftZRmnd2xQotc/NONQc1A6qMjA1bXW8O2fEzJ4poip wI9AckoKT1qiYytF27nIDLV3qVfODQ/mqlXxeJ7WKeqo3H4GCFKg1oC+e3Yip+zw+nXs m03dxS0AKlbIA9yKET3K9+c3uWwuh3r6Jw00jO0z5e3nQ9KaIdvRyjX1N9vyDk5tRzcn H7zvi/NdWSRhPuO9woAj1dONoZgRhrZXUALSOk9A+5h1pvx5j4dT4U5fjnp83wJUd7aD 346g== X-Forwarded-Encrypted: i=1; AHgh+RrtDi8Lq0wmEoaTyuOkmxrs9dn0KTwDPJ9KH6Iqz7JQCdBrwz4T/zMmFw3NkNI9JJI0a8iFrRUHLbnKz8Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxMhd3X425nR8nQShN3fjMc5Cc1TmQhp5vtVulX5cygZVn3HHTp kg8SANLlJbBJqTOdUr33vcKVhWk+PxGJsLUnBVDTXp6dhRz8cn6GzqjeStCRGqbjSXR6bEW1ZCO PDWEu7Jd9LLxxahfH0FbEKW+TWZCHrGGAvOoiRxrVfgZVUmw5CcNDugX01A+FjqsxK50= X-Gm-Gg: AR+sD10W5M88CBtXiUiDWgmzqmW9piaDpBmrjQy5VZM79hhXFlB87jsgXAyIccjwoso G8gDkpKf7T8WHXazFFe32afCbObe+ofnr5HxidXj1yAEYiQGi1yLXr0Wp3uJ+Qd6si4WHCFEjEv 8k3pAFOpUCjypTFGo8BYTac0AFf8ggfBoCJfs3+38pUa7BI9+eGI4nsUdwMlDIjiIC0WBlPJHNR 97UAdrNRX5MAcSTGglOjtI7d1KwcbqIUIoOsDf7qU9e8JwgfBaLt7WVxiVAJ6UwTvmBqIQ6D9qB DtYQCaiyyxv1dTldDxcMyrEirz/6cbdPs7FUb/wtnEuPFbw+1/Sr5kMVcN4R8ccEPkTRDBPM7ct Yjxwu0TeiQ7xELm9m4NiFspUJocrVVWemmJkwPA2c1eqamTY= X-Received: by 2002:a17:903:1b08:b0:2c6:d710:3e58 with SMTP id d9443c01a7336-2d015d5b940mr84316035ad.36.1785340625635; Wed, 29 Jul 2026 08:57:05 -0700 (PDT) X-Received: by 2002:a17:903:1b08:b0:2c6:d710:3e58 with SMTP id d9443c01a7336-2d015d5b940mr84315725ad.36.1785340625211; Wed, 29 Jul 2026 08:57:05 -0700 (PDT) Received: from localhost (c-73-37-105-206.hsd1.or.comcast.net. [73.37.105.206]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d022bf39b5sm13502115ad.57.2026.07.29.08.57.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 08:57:04 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Sashiko , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b) Subject: [PATCH v7 09/17] drm/msm/gem: Fix dma_buf import error paths Date: Wed, 29 Jul 2026 08:55:46 -0700 Message-ID: <20260729155609.20190-10-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260729155609.20190-1-robin.clark@oss.qualcomm.com> References: <20260729155609.20190-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI5MDEyNyBTYWx0ZWRfX07wZJPm/97g6 EBnJQfzqD6dekGKRBYvHjcRVRZ5FntNxY3jQQifuo4WaL/hRqsRGdAy9Qbp7BcKb6+0BWnmhoc6 h8NFP0ZmSmwW3gToVoEpk6qd80l50GI= X-Proofpoint-ORIG-GUID: zs8NC0W91fAYc9OnrSS_Jn5XDaGL12gi X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI5MDEyNyBTYWx0ZWRfX9t54XnXHbR0s 2Bic97vrJmIDhllmH6bJG6D/oS4csqxtpkXsMqxNUAcR7nHkvgE9ZgeBsm5F3AoTM3Ye13qS1Ge 8HOG2F7cY08A2pEo/dxla11OjGNFBN+iHdBOVg3SzKRbZSix5e2zrsfNzJFILxb3S01wYEj56+j spRNjZJY69SubtUUzqGigW5EzkB+pgUmodFEH3tg3uo9GGQ6cDx5HkGbArCaVYSy/LUPV+V8o7P 1RnsLe0tMewauSpmGsytOrvKndSytBpRrSq2Ps3gxdi8eoyRveWU5p9+vt9opOSy6D4Bv6ec1F0 svneyAAeLANy7rNiINacE1bOJJrSH/osDHBkRtajY19hNa0CyMFO5wuyf6g0vMdolKL+9/Z+hTN lHQQhfLI4YgxrMeRgx/u81ElPg1HSfZr0tI7cv6z75VxcTnlP12pSp3cQrJpGltpSOnxVYNQO0/ dL16lt4SZFkntoIwCGw== X-Authority-Analysis: v=2.4 cv=VJTtWdPX c=1 sm=1 tr=0 ts=6a6a22d2 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=19Wyn7e3V/0aNffMjNCMQw==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=sWKEhP36mHoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=CL2m_loAqK5Y4tUKEbYA:9 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-GUID: zs8NC0W91fAYc9OnrSS_Jn5XDaGL12gi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-29_06,2026-07-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607290127 Set import_attach early, so that if we hit an error path msm_gem_free_object() goes down the drm_gem_is_imported() path. Set sgt late so _free_object() skips drm_prime_gem_destroy() as this is done by drm_gem_prime_import_dev(). Reported-by: Sashiko Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem.c | 17 ++++++++++++++--- drivers/gpu/drm/msm/msm_gem.h | 3 ++- drivers/gpu/drm/msm/msm_gem_prime.c | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index efd3d3c9a449..74c3728f45bd 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -1093,7 +1093,9 @@ static void msm_gem_free_object(struct drm_gem_object *obj) */ kvfree(msm_obj->pages); - drm_prime_gem_destroy(obj, msm_obj->sgt); + /* In msm_gem_import() error path, sgt won't be set yet: */ + if (msm_obj->sgt) + drm_prime_gem_destroy(obj, msm_obj->sgt); } else { msm_gem_vunmap(obj); put_pages(obj); @@ -1282,11 +1284,13 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev, size_t size, uint32_t } struct drm_gem_object *msm_gem_import(struct drm_device *dev, - struct dma_buf *dmabuf, struct sg_table *sgt) + struct dma_buf_attachment *attach, + struct sg_table *sgt) { struct msm_drm_private *priv = dev->dev_private; struct msm_gem_object *msm_obj; struct drm_gem_object *obj; + struct dma_buf *dmabuf = attach->dmabuf; size_t size, npages; int ret; @@ -1296,13 +1300,17 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, if (ret) return ERR_PTR(ret); + /* + * Set import_attach here in case we hit an error path that ends + * up in drm_gem_object_put() -> msm_gem_free_object() + */ + obj->import_attach = attach; drm_gem_private_object_init(dev, obj, size); npages = size / PAGE_SIZE; msm_obj = to_msm_bo(obj); msm_gem_lock(obj); - msm_obj->sgt = sgt; msm_obj->pages = kvmalloc_objs(struct page *, npages); if (!msm_obj->pages) { msm_gem_unlock(obj); @@ -1328,6 +1336,9 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, if (ret) goto fail; + /* Now that we are past potential failure points, set sgt: */ + msm_obj->sgt = sgt; + return obj; fail: diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 762e546d25ef..86dc93cc1804 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -302,7 +302,8 @@ void *msm_gem_kernel_new(struct drm_device *dev, size_t size, uint32_t flags, uint64_t *iova); void msm_gem_kernel_put(struct drm_gem_object *bo, struct drm_gpuvm *vm); struct drm_gem_object *msm_gem_import(struct drm_device *dev, - struct dma_buf *dmabuf, struct sg_table *sgt); + struct dma_buf_attachment *attach, + struct sg_table *sgt); __printf(2, 3) void msm_gem_object_set_name(struct drm_gem_object *bo, const char *fmt, ...); diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c index 036d34c674d9..beb7f22fd694 100644 --- a/drivers/gpu/drm/msm/msm_gem_prime.c +++ b/drivers/gpu/drm/msm/msm_gem_prime.c @@ -83,7 +83,7 @@ struct drm_gem_object *msm_gem_prime_import(struct drm_device *dev, struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sg) { - return msm_gem_import(dev, attach->dmabuf, sg); + return msm_gem_import(dev, attach, sg); } struct dma_buf *msm_gem_prime_export(struct drm_gem_object *obj, int flags) -- 2.55.0