Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5de1cb2d authored by Huang Shijie's avatar Huang Shijie Committed by Linus Torvalds
Browse files

kernel/resource.c: handle reinsertion of an already-inserted resource 



If the same resource is inserted to the resource tree (maybe not on
purpose), a dead loop will be created.  In this situation, The kernel does
not report any warning or error :(

  The command below will show a endless print.
  #cat /proc/iomem

[akpm@linux-foundation.org: add WARN_ON()]
Signed-off-by: default avatarHuang Shijie <shijie8@gmail.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 144ecf31

kernel/resource.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -453,6 +453,8 @@ static struct resource * __insert_resource(struct resource *parent, struct resou 




		if (first == parent)

		if (first == parent)

			return first;

			return first;

		if (WARN_ON(first == new))	/* duplicated insertion */

			return first;





		if ((first->start > new->start) || (first->end < new->end))

		if ((first->start > new->start) || (first->end < new->end))

			break;

			break;