Skip to content

Commit 59ceeaa

Browse files
simonguinottorvalds
authored andcommitted
kernel/resource.c: fix muxed resource handling in __request_region()
In __request_region, if a conflict with a BUSY and MUXED resource is detected, then the caller goes to sleep and waits for the resource to be released. A pointer on the conflicting resource is kept. At wake-up this pointer is used as a parent to retry to request the region. A first problem is that this pointer might well be invalid (if for example the conflicting resource have already been freed). Another problem is that the next call to __request_region() fails to detect a remaining conflict. The previously conflicting resource is passed as a parameter and __request_region() will look for a conflict among the children of this resource and not at the resource itself. It is likely to succeed anyway, even if there is still a conflict. Instead, the parent of the conflicting resource should be passed to __request_region(). As a fix, this patch doesn't update the parent resource pointer in the case we have to wait for a muxed region right after. Reported-and-tested-by: Vincent Pelletier <[email protected]> Signed-off-by: Simon Guinot <[email protected]> Tested-by: Vincent Donnefort <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 020ecbb commit 59ceeaa

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

kernel/resource.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1083,9 +1083,10 @@ struct resource * __request_region(struct resource *parent,
10831083
if (!conflict)
10841084
break;
10851085
if (conflict != parent) {
1086-
parent = conflict;
1087-
if (!(conflict->flags & IORESOURCE_BUSY))
1086+
if (!(conflict->flags & IORESOURCE_BUSY)) {
1087+
parent = conflict;
10881088
continue;
1089+
}
10891090
}
10901091
if (conflict->flags & flags & IORESOURCE_MUXED) {
10911092
add_wait_queue(&muxed_resource_wait, &wait);

0 commit comments

Comments
 (0)