accel/qaic: Call DRM helper function to destroy prime GEM
authorPranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com>
Wed, 14 Jun 2023 16:15:28 +0000 (10:15 -0600)
committerJeffrey Hugo <quic_jhugo@quicinc.com>
Tue, 20 Jun 2023 14:07:29 +0000 (08:07 -0600)
smatch warning:
drivers/accel/qaic/qaic_data.c:620 qaic_free_object() error:
dereferencing freed memory 'obj->import_attach'

obj->import_attach is detached and freed using dma_buf_detach().
But used after free to decrease the dmabuf ref count using
dma_buf_put().

drm_prime_gem_destroy() handles this issue and performs the proper clean
up instead of open coding it in the driver.

Fixes: ff13be830333 ("accel/qaic: Add datapath")
Reported-by: Sukrut Bellary <sukrut.bellary@linux.com>
Closes: https://lore.kernel.org/all/20230610021200.377452-1-sukrut.bellary@linux.com/
Suggested-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Pranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com>
Reviewed-by: Carl Vanderlip <quic_carlv@quicinc.com>
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230614161528.11710-1-quic_jhugo@quicinc.com
drivers/accel/qaic/qaic_data.c

index e42c1f9ffff85eb72650b2bc75590d924d4f3d02..e9a1cb779b3056aedb3cb561926d5472aab56d11 100644 (file)
@@ -23,6 +23,7 @@
 #include <linux/wait.h>
 #include <drm/drm_file.h>
 #include <drm/drm_gem.h>
+#include <drm/drm_prime.h>
 #include <drm/drm_print.h>
 #include <uapi/drm/qaic_accel.h>
 
@@ -616,8 +617,7 @@ static void qaic_free_object(struct drm_gem_object *obj)
 
        if (obj->import_attach) {
                /* DMABUF/PRIME Path */
-               dma_buf_detach(obj->import_attach->dmabuf, obj->import_attach);
-               dma_buf_put(obj->import_attach->dmabuf);
+               drm_prime_gem_destroy(obj, NULL);
        } else {
                /* Private buffer allocation path */
                qaic_free_sgt(bo->sgt);