diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-06-04 13:53:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-28 08:28:36 +0200 |
| commit | 4528cbb9659195c82bf80745e5abdc14e9ecbb79 (patch) | |
| tree | c82c7b853a633930ae3155b2f4984afea541da4b | |
| parent | 19fab82084e094800ceb5cb3e5f6411769524152 (diff) | |
| download | linux-stable-4528cbb9659195c82bf80745e5abdc14e9ecbb79.tar.gz linux-stable-4528cbb9659195c82bf80745e5abdc14e9ecbb79.tar.bz2 linux-stable-4528cbb9659195c82bf80745e5abdc14e9ecbb79.zip | |
dma-buf: Discard old fence_excl on retrying get_fences_rcu for realloc
commit f5b07b04e5f090a85d1e96938520f2b2b58e4a8e upstream.
If we have to drop the seqcount & rcu lock to perform a krealloc, we
have to restart the loop. In doing so, be careful not to lose track of
the already acquired exclusive fence.
Fixes: fedf54132d24 ("dma-buf: Restart reservation_object_get_fences_rcu() after writes")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: stable@vger.kernel.org #v4.10
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190604125323.21396-1-chris@chris-wilson.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/dma-buf/reservation.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c index c1618335ca99..03004a218ec1 100644 --- a/drivers/dma-buf/reservation.c +++ b/drivers/dma-buf/reservation.c @@ -357,6 +357,10 @@ int reservation_object_get_fences_rcu(struct reservation_object *obj, GFP_NOWAIT | __GFP_NOWARN); if (!nshared) { rcu_read_unlock(); + + dma_fence_put(fence_excl); + fence_excl = NULL; + nshared = krealloc(shared, sz, GFP_KERNEL); if (nshared) { shared = nshared; |