hugetlb: Fix possible deadlock
Subsystems (2)
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")
Signed-off-by Ethan Tidmore <[email protected]>
--- mm/hugetlb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
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;
Signature · 1 line
2.53.0
Andrew Morton
maintainerQuoted 10 lines · On Tue, 24 Mar 2026 19:46:53 -0500 Ethan Tidmore <[email protected]>…
In
allocate_file_region_entries()error path the functionregion_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.