Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <plr.vincent@gmail.com>
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Tested-by: Vincent Donnefort <vdonnefort@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Simon Guinot and committed by
Linus Torvalds
59ceeaaf 020ecbba

+3 -2
+3 -2
kernel/resource.c
··· 1083 1083 if (!conflict) 1084 1084 break; 1085 1085 if (conflict != parent) { 1086 - parent = conflict; 1087 - if (!(conflict->flags & IORESOURCE_BUSY)) 1086 + if (!(conflict->flags & IORESOURCE_BUSY)) { 1087 + parent = conflict; 1088 1088 continue; 1089 + } 1089 1090 } 1090 1091 if (conflict->flags & flags & IORESOURCE_MUXED) { 1091 1092 add_wait_queue(&muxed_resource_wait, &wait);