Skip to contentSkip to conversation

hugetlb: Fix possible deadlock

PATCH In review Ethan Tidmore 2 participants 2 messages Mar 25

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

PATCH 1/1 hugetlb: Fix possible deadlock

In allocate_file_region_entries() error path the function region_chg() returns but does not release the lock 'resv->lock'.

Release lock 'resv->lock' before returning.

Fixes 0db9d74ed8845 ("hugetlb: disable region_add file_region coalescing")
---
 mm/hugetlb.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
mm/hugetlb.c +3 -1
index d6ea11113f1d..230fd8c63588 100644
@@ -807,8 +807,10 @@ static long region_chg(struct resv_map *resv, long f, long t,
 	if (*out_regions_needed == 0)
 		*out_regions_needed = 1;
 
-	if (allocate_file_region_entries(resv, *out_regions_needed))
+	if (allocate_file_region_entries(resv, *out_regions_needed)) {
+		spin_unlock(&resv->lock);
 		return -ENOMEM;
+	}
 
 	resv->adds_in_progress += *out_regions_needed;
 
Signature · 1 line
2.53.0
maintainer
#1 lore raw
Quoted 10 lines · On Tue, 24 Mar 2026 19:46:53 -0500 Ethan Tidmore <[email protected]>…

In allocate_file_region_entries() error path the function region_chg() returns but does not release the lock 'resv->lock'.

Release lock 'resv->lock' before returning.

...

mm/hugetlb.c static long region_chg(struct resv_map *resv, long f, long t, · line 815

Quoted 10 lines
mm/hugetlb.c +3 -1
@@ -807,8 +807,10 @@ static long region_chg(struct resv_map *resv, long f, long t,
 	if (*out_regions_needed == 0)
 		*out_regions_needed = 1;
 
-	if (allocate_file_region_entries(resv, *out_regions_needed))
+	if (allocate_file_region_entries(resv, *out_regions_needed)) {
+		spin_unlock(&resv->lock);
 		return -ENOMEM;
+	}
 
 	resv->adds_in_progress += *out_regions_needed;

Thanks, but please see how allocate_file_region_entries() leaves the lock unheld if it's going to return -ENOMEM.