28 lines
746 B
Diff
28 lines
746 B
Diff
|
From 0b4480a51b80954e34605c9bf42947d97e37d1c3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
||
|
|
Date: Fri, 13 Mar 2015 12:43:36 +0000
|
||
|
|
Subject: [PATCH] Protect __release_resource against resources without parents
|
||
|
|
|
||
|
|
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
|
||
|
|
@@ -246,6 +246,12 @@ static int __release_resource(struct res
|
||
|
|
{
|
||
|
|
struct resource *tmp, **p, *chd;
|
||
|
|
|
||
|
|
+ if (!old->parent) {
|
||
|
|
+ WARN(old->sibling, "sibling but no parent");
|
||
|
|
+ if (old->sibling)
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
p = &old->parent->child;
|
||
|
|
for (;;) {
|
||
|
|
tmp = *p;
|