diff options
| author | Christian König <ckoenig.leichtzumerken@gmail.com> | 2022-08-10 19:26:17 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2022-08-25 13:10:30 +0200 |
| commit | a3f7c10a269d5b77dd5822ade822643ced3057f0 (patch) | |
| tree | ef21e969f869b7cb50e128264e2af4fc59db92f3 | |
| parent | 6b04ce966a738ecdd9294c9593e48513c0dc90aa (diff) | |
dma-buf/dma-resv: check if the new fence is really laterdrm-misc-fixes-2022-08-31
Previously when we added a fence to a dma_resv object we always
assumed the the newer than all the existing fences.
With Jason's work to add an UAPI to explicit export/import that's not
necessary the case any more. So without this check we would allow
userspace to force the kernel into an use after free error.
Since the change is very small and defensive it's probably a good
idea to backport this to stable kernels as well just in case others
are using the dma_resv object in the same way.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220810172617.140047-1-christian.koenig@amd.com
Cc: stable@vger.kernel.org # v5.19+
| -rw-r--r-- | drivers/dma-buf/dma-resv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index 205acb2c744d..e3885c90a3ac 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -295,7 +295,8 @@ void dma_resv_add_fence(struct dma_resv *obj, struct dma_fence *fence, enum dma_resv_usage old_usage; dma_resv_list_entry(fobj, i, obj, &old, &old_usage); - if ((old->context == fence->context && old_usage >= usage) || + if ((old->context == fence->context && old_usage >= usage && + dma_fence_is_later(fence, old)) || dma_fence_is_signaled(old)) { dma_resv_list_set(fobj, i, fence, usage); dma_fence_put(old); |