dma-buf: Fix NULL pointer dereference in dma_fence_enable_sw_signaling()
Subsystems (3)
PATCH 1/1 dma-buf: Fix NULL pointer dereference in dma_fence_enable_sw_signaling()
Currently, a NULL pointer dereference will happen in function dma_fence_enable_sw_signaling() (at line 615), in case chain is not allocated in mock_chain() and this function returns NULL (at line 86). See below:
drivers/dma-buf/st-dma-fence-chain.c:
86 chain = mock_chain(NULL, f, 1);
87 if (!chain)
88 err = -ENOMEM;
89
90 dma_fence_enable_sw_signaling(chain);
drivers/dma-buf/dma-fence.c:
611 void dma_fence_enable_sw_signaling(struct dma_fence *fence) 612 {
613 unsigned long flags;
614
615 spin_lock_irqsave(fence->lock, flags); ^^^^^^^^^^^ | NULL pointer reference if fence == NULL
616 __dma_fence_enable_signaling(fence);
617 spin_unlock_irqrestore(fence->lock, flags);
618 }
Fix this by adding a NULL check before dereferencing fence in dma_fence_enable_sw_signaling(). This will prevent any other NULL pointer dereference when the fence passed as an argument is NULL.
Addresses-Coverity: ("Dereference after null check")
--- drivers/dma-buf/dma-fence.c | 9 ++++++++- include/linux/dma-fence.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/dma-buf/dma-fence.c +8 -1
@@ -607,14 +607,21 @@ static bool __dma_fence_enable_signaling(struct dma_fence *fence)* This will request for sw signaling to be enabled, to make the fence * complete as soon as possible. This calls &dma_fence_ops.enable_signaling * internally. +* +* Returns 0 on success and a negative error value when @fence is NULL. */ -void dma_fence_enable_sw_signaling (struct dma_fence *fence) +int dma_fence_enable_sw_signaling (struct dma_fence *fence) {unsigned long flags; +if (!fence) +return -EINVAL ; +spin_lock_irqsave (fence->lock, flags);__dma_fence_enable_signaling (fence);spin_unlock_irqrestore (fence->lock, flags); + +return 0 ; }EXPORT_SYMBOL (dma_fence_enable_sw_signaling);
include/linux/dma-fence.h +1 -1
@@ -399,7 +399,7 @@ int dma_fence_add_callback(struct dma_fence *fence, dma_fence_func_t func);bool dma_fence_remove_callback (struct dma_fence *fence,struct dma_fence_cb *cb); -void dma_fence_enable_sw_signaling (struct dma_fence *fence); +int dma_fence_enable_sw_signaling (struct dma_fence *fence);/** * dma_fence_is_signaled_locked - Return an indication if the fence
Signature · 1 line
2.34.1
Quoted 11 lines · Gustavo A. R. Silva
Currently, a NULL pointer dereference will happen in function
dma_fence_enable_sw_signaling()(at line 615), in casechainis not allocated inmock_chain()and this function returnsNULL(at line 86). See below:
drivers/dma-buf/st-dma-fence-chain.c:
86 chain =mock_chain(NULL, f, 1);
87 if (!chain)
88 err =-ENOMEM;
89
90dma_fence_enable_sw_signaling(chain);
Instead of the larger patch, should line 88 here just do a "return -ENOMEM" instead?
-Kees
Quoted 73 lines
drivers/dma-buf/dma-fence.c:
611 voiddma_fence_enable_sw_signaling(struct dma_fence *fence)612 {
613 unsigned long flags;
614615 spin_lock_irqsave(fence->lock, flags); ^^^^^^^^^^^ | NULL pointer reference if fence == NULL616
__dma_fence_enable_signaling(fence);
617spin_unlock_irqrestore(fence->lock, flags);
618 }Fix this by adding a NULL check before dereferencing
fenceindma_fence_enable_sw_signaling(). This will prevent any other NULL pointer dereference when thefencepassed as an argument isNULL.Addresses-Coverity: ("Dereference after null check")
Fixes d62c43a953ce ("dma-buf: Enable signaling on fence for selftests")Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/dma-buf/dma-fence.c | 9 ++++++++- include/linux/dma-fence.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-)drivers/dma-buf/dma-fence.c +8
-1@@ -607,14 +607,21 @@ static bool __dma_fence_enable_signaling(struct dma_fence *fence)* This will request for sw signaling to be enabled, to make the fence * complete as soon as possible. This calls &dma_fence_ops.enable_signaling * internally. +* +* Returns 0 on success and a negative error value when @fence is NULL. */ -void dma_fence_enable_sw_signaling (struct dma_fence *fence) +int dma_fence_enable_sw_signaling (struct dma_fence *fence) {unsigned long flags; +if (!fence) +return -EINVAL ; +spin_lock_irqsave (fence->lock, flags);__dma_fence_enable_signaling (fence);spin_unlock_irqrestore (fence->lock, flags); + +return 0 ; }EXPORT_SYMBOL (dma_fence_enable_sw_signaling);include/linux/dma-fence.h +1
-1@@ -399,7 +399,7 @@ int dma_fence_add_callback(struct dma_fence *fence, dma_fence_func_t func);bool dma_fence_remove_callback (struct dma_fence *fence,struct dma_fence_cb *cb); -void dma_fence_enable_sw_signaling (struct dma_fence *fence); +int dma_fence_enable_sw_signaling (struct dma_fence *fence);/** * dma_fence_is_signaled_locked - Return an indication if the fence Signature · 1 line
2.34.1
Signature · 1 line
Kees Cook
Quoted 13 lines · Kees Cook
Quoted 11 lines · Gustavo A. R. Silva
Currently, a NULL pointer dereference will happen in function
dma_fence_enable_sw_signaling()(at line 615), in casechainis not allocated inmock_chain()and this function returnsNULL(at line 86). See below:
drivers/dma-buf/st-dma-fence-chain.c:
86 chain =mock_chain(NULL, f, 1);
87 if (!chain)
88 err =-ENOMEM;
89
90dma_fence_enable_sw_signaling(chain);
Quoted 2 lines
Instead of the larger patch, should line 88 here just do a "return
-ENOMEM" instead?
Nope. I would have to add a goto to skip dma_fence_enable_sw_signaling(chain).
I originally thought of that, but as other _signaling() functions have sanity-checks inside, I decided to go with that solution.
This bug has been there since Sep 2022. So, adding a sanity check inside that function should prevent any other issue of this same kind to enter the codebase and stay there for years.
--
Gustavo
Quoted 77 lines
-Kees
Quoted 73 lines
drivers/dma-buf/dma-fence.c:
611 voiddma_fence_enable_sw_signaling(struct dma_fence *fence)612 {
613 unsigned long flags;
614615 spin_lock_irqsave(fence->lock, flags); ^^^^^^^^^^^ | NULL pointer reference if fence == NULL616 __dma_fence_enable_signaling(fence); 617 spin_unlock_irqrestore(fence->lock, flags); 618 }Fix this by adding a NULL check before dereferencing
fenceindma_fence_enable_sw_signaling(). This will prevent any other NULL pointer dereference when thefencepassed as an argument isNULL.Addresses-Coverity: ("Dereference after null check")
Fixes d62c43a953ce ("dma-buf: Enable signaling on fence for selftests")Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/dma-buf/dma-fence.c | 9 ++++++++- include/linux/dma-fence.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-)drivers/dma-buf/dma-fence.c +8
-1@@ -607,14 +607,21 @@ static bool __dma_fence_enable_signaling(struct dma_fence *fence)* This will request for sw signaling to be enabled, to make the fence * complete as soon as possible. This calls &dma_fence_ops.enable_signaling * internally. +* +* Returns 0 on success and a negative error value when @fence is NULL. */ -void dma_fence_enable_sw_signaling (struct dma_fence *fence) +int dma_fence_enable_sw_signaling (struct dma_fence *fence) {unsigned long flags; +if (!fence) +return -EINVAL ; +spin_lock_irqsave (fence->lock, flags);__dma_fence_enable_signaling (fence);spin_unlock_irqrestore (fence->lock, flags); + +return 0 ; }EXPORT_SYMBOL (dma_fence_enable_sw_signaling);include/linux/dma-fence.h +1
-1@@ -399,7 +399,7 @@ int dma_fence_add_callback(struct dma_fence *fence, dma_fence_func_t func);bool dma_fence_remove_callback (struct dma_fence *fence,struct dma_fence_cb *cb); -void dma_fence_enable_sw_signaling (struct dma_fence *fence); +int dma_fence_enable_sw_signaling (struct dma_fence *fence);/** * dma_fence_is_signaled_locked - Return an indication if the fence Signature · 1 line
2.34.1
Christian König
maintainerAm 11.10.23 um 18:13 schrieb Gustavo A. R. Silva:
Quoted 19 lines · Kees Cook
Quoted 13 lines · Gustavo A. R. Silva
Quoted 11 lines
Currently, a NULL pointer dereference will happen in function
dma_fence_enable_sw_signaling()(at line 615), in casechainis not allocated inmock_chain()and this function returnsNULL(at line 86). See below:
drivers/dma-buf/st-dma-fence-chain.c:
86 chain =mock_chain(NULL, f, 1); 87 if (!chain)
88 err =-ENOMEM;
89
90dma_fence_enable_sw_signaling(chain);Quoted 2 lines
Instead of the larger patch, should line 88 here just do a "return
-ENOMEM" instead?
Quoted 8 lines
Nope. I would have to add a
gototo skipdma_fence_enable_sw_signaling(chain).I originally thought of that, but as other
_signaling()functions have sanity-checks inside, I decided to go with that solution.This bug has been there since Sep 2022. So, adding a sanity check inside that function should prevent any other issue of this same kind to enter the codebase and stay there for years.
I'm trying to remove those sanity checks for years since they are hiding problems instead of getting them fixed.
Calling dma_fence_enable_sw_signaling with a NULL pointer is a coding error and not a recoverable runtime error.
The test case should be fixed instead.
Regards,
Christian.
Quoted 80 lines
Signature · 2 lines
-- GustavoQuoted 76 lines
-Kees
Quoted 72 lines
drivers/dma-buf/dma-fence.c:
611 voiddma_fence_enable_sw_signaling(struct dma_fence *fence)612 {
613 unsigned long flags;
614
615spin_lock_irqsave(fence->lock, flags); ^^^^^^^^^^^
|
NULL pointer reference
if fence == NULL616
__dma_fence_enable_signaling(fence); 617spin_unlock_irqrestore(fence->lock, flags); 618 }Fix this by adding a NULL check before dereferencing
fenceindma_fence_enable_sw_signaling(). This will prevent any other NULL pointer dereference when thefencepassed as an argument isNULL.Addresses-Coverity: ("Dereference after null check")
Fixes d62c43a953ce ("dma-buf: Enable signaling on fence for selftests")Signed-off-by Gustavo A. R. Silva <[email protected]>---
drivers/dma-buf/dma-fence.c| 9 ++++++++-
include/linux/dma-fence.h | 2 +-2 files changed, 9 insertions(+), 2 deletions(-)drivers/dma-buf/dma-fence.c +2
-0@@ -607,14 +607,21 @@ static bool __dma_fence_enable_signaling(struct dma_fence *fence) * This will request for sw signaling to be enabled, to make the fence * complete as soon as possible. This calls &dma_fence_ops.enable_signaling * internally. + * + * Returns 0 on success and a negative error value when @fence isNULL.
*/drivers/dma-buf/dma-fence.c +1
-1-void dma_fence_enable_sw_signaling (struct dma_fence *fence) +int dma_fence_enable_sw_signaling (struct dma_fence *fence){
unsigned long flags;
+ if (!fence)
+ return-EINVAL;
+
spin_lock_irqsave(fence->lock, flags);__dma_fence_enable_signaling(fence);spin_unlock_irqrestore(fence->lock, flags);
+
+ return 0;
}
EXPORT_SYMBOL(dma_fence_enable_sw_signaling);
diff --gita/include/linux/dma-fence.hb/include/linux/dma-fence.hindexebe78bd3d121..1e4025e925e6100644include/linux/dma-fence.h +1
-1@@ -399,7 +399,7 @@ int dma_fence_add_callback(struct dma_fence *fence, dma_fence_func_t func); bool dma_fence_remove_callback(struct dma_fence *fence, struct dma_fence_cb *cb); -void dma_fence_enable_sw_signaling (struct dma_fence *fence); +int dma_fence_enable_sw_signaling (struct dma_fence *fence); /*** dma_fence_is_signaled_locked - Return an indication if the fence Signature · 1 line
2.34.1