Skip to contentSkip to conversation

drm/etnaviv: Fix a leak in submit_pin_objects()

PATCH Applied Dan Carpenter 2 participants 2 messages May 18, 2020 – May 19, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/etnaviv: Fix a leak in submit_pin_objects()

If the mapping address is wrong then we have to release the reference to it before returning -EINVAL.

Fixes 088880ddc0b2 ("drm/etnaviv: implement softpin")

---
From static analysis. Untested.

 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +3 -1
index 3b0afa156d92..54def341c1db 100644
@@ -238,8 +238,10 @@ static int submit_pin_objects(struct etnaviv_gem_submit *submit)
 		}
 
 		if ((submit->flags & ETNA_SUBMIT_SOFTPIN) &&
-		     submit->bos[i].va != mapping->iova)
+		     submit->bos[i].va != mapping->iova) {
+			etnaviv_gem_mapping_unreference(mapping);
 			return -EINVAL;
+		}
 
 		atomic_inc(&etnaviv_obj->gpu_active);
 
Signature · 1 line
2.26.2
maintainer Applied
#1 lore raw

Am Montag, den 18.05.2020, 14:29 +0300 schrieb Dan Carpenter:

Quoted 5 lines

If the mapping address is wrong then we have to release the reference to it before returning -EINVAL.

Fixes 088880ddc0b2 ("drm/etnaviv: implement softpin")

Thanks, applied to etnaviv/fixes.

Regards,
Lucas

Quoted 22 lines

---
From static analysis. Untested.

 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +3 -1
index 3b0afa156d92..54def341c1db 100644
@@ -238,8 +238,10 @@ static int submit_pin_objects(struct etnaviv_gem_submit *submit)
 		}
 
 		if ((submit->flags & ETNA_SUBMIT_SOFTPIN) &&
-		     submit->bos[i].va != mapping->iova)
+		     submit->bos[i].va != mapping->iova) {
+			etnaviv_gem_mapping_unreference(mapping);
 			return -EINVAL;
+		}
 
 		atomic_inc(&etnaviv_obj->gpu_active);