2016-12-02 10:50:26 +00:00
|
|
|
From a58c105dfd13e0ba54a1124d0aad81d9c25f85e3 Mon Sep 17 00:00:00 2001
|
2016-04-07 19:25:10 +00:00
|
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
Date: Fri, 13 Mar 2015 12:43:36 +0000
|
2016-09-10 12:54:26 +00:00
|
|
|
Subject: [PATCH] Protect __release_resource against resources without parents
|
2016-04-07 19:25:10 +00:00
|
|
|
|
|
|
|
Without this patch, removing a device tree overlay can crash here.
|
|
|
|
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
---
|
|
|
|
kernel/resource.c | 6 ++++++
|
|
|
|
1 file changed, 6 insertions(+)
|
|
|
|
|
|
|
|
--- a/kernel/resource.c
|
|
|
|
+++ b/kernel/resource.c
|
2017-08-17 16:58:24 +00:00
|
|
|
@@ -246,6 +246,12 @@ static int __release_resource(struct res
|
2016-04-07 19:25:10 +00:00
|
|
|
{
|
|
|
|
struct resource *tmp, **p;
|
|
|
|
|
|
|
|
+ if (!old->parent) {
|
|
|
|
+ WARN(old->sibling, "sibling but no parent");
|
|
|
|
+ if (old->sibling)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
p = &old->parent->child;
|
|
|
|
for (;;) {
|
|
|
|
tmp = *p;
|