]> git.baikalelectronics.ru Git - kernel.git/commit
dma-buf: fix dma_buf_export init order v2
authorChristian König <christian.koenig@amd.com>
Tue, 6 Dec 2022 13:07:49 +0000 (14:07 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jan 2023 06:24:30 +0000 (07:24 +0100)
commit0568b24eb12e5fcdc5bb0fc97e71769b5e6088cb
treeeb9ed5a0ed3d68a3b1a4ab693262a9ba36813b9a
parent088e93686849a921dc5515076ab71db29af14ef8
dma-buf: fix dma_buf_export init order v2

[ Upstream commit 5fc517913c587160965ae4147a96e7b1f10f5141 ]

The init order and resulting error handling in dma_buf_export
was pretty messy.

Subordinate objects like the file and the sysfs kernel objects
were initializing and wiring itself up with the object in the
wrong order resulting not only in complicating and partially
incorrect error handling, but also in publishing only halve
initialized DMA-buf objects.

Clean this up thoughtfully by allocating the file independent
of the DMA-buf object. Then allocate and initialize the DMA-buf
object itself, before publishing it through sysfs. If everything
works as expected the file is then connected with the DMA-buf
object and publish it through debugfs.

Also adds the missing dma_resv_fini() into the error handling.

v2: add some missing changes to dma_bug_getfile() and a missing NULL
    check in dma_buf_file_release()

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Reviewed-by: T.J. Mercier <tjmercier@google.com>
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20221209071535.933698-1-christian.koenig@amd.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/dma-buf/dma-buf-sysfs-stats.c
drivers/dma-buf/dma-buf-sysfs-stats.h
drivers/dma-buf/dma-buf.c