Skip to contentSkip to conversation

x86/stacktrace: Fix infinite loop in arch_stack_walk_user()

PATCH In review Eiichi Tsukata 3 participants 3 messages Jul 11, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/stacktrace: Fix infinite loop in arch_stack_walk_user()

Current arch_stack_walk_user() checks if (fp == frame.next_fp) to prevent infinite loop by self reference but it's not enogh for circular reference.

Once we find a lack of return address, there is no need to continue loop, so let's break out.

Fixes 02b67518e2b1 ("tracing: add support for userspace stacktraces in tracing/iter_ctrl")
---
 arch/x86/kernel/stacktrace.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
arch/x86/kernel/stacktrace.c +2 -5
index 2abf27d7df6b..b1a1f4b4c943 100644
@@ -129,11 +129,8 @@ void arch_stack_walk_user(stack_trace_consume_fn consume_entry, void *cookie,
 			break;
 		if ((unsigned long)fp < regs->sp)
 			break;
-		if (frame.ret_addr) {
-			if (!consume_entry(cookie, frame.ret_addr, false))
-				return;
-		}
-		if (fp == frame.next_fp)
+		if (!frame.ret_addr ||
+		    !consume_entry(cookie, frame.ret_addr, false))
 			break;
 		fp = frame.next_fp;
 	}
Signature · 1 line
2.21.0
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Eiichi Tsukata

Once we find a lack of return address, there is no need to continue loop, so let's break out.

Looks good to me, feel free to add

and I'll assume this comes through the x86 -tip tree..

Linus

#2 lore raw

[tip:x86/urgent] x86/stacktrace: Prevent infinite loop in arch_stack_walk_user()

In reply to Eiichi Tsukata
x86/stacktrace: Prevent infinite loop in arch_stack_walk_user()
Commit-ID:  cbf5b73d162b22e044fe0b7d51dcaa33be065253
Gitweb:     https://git.kernel.org/tip/cbf5b73d162b22e044fe0b7d51dcaa33be065253
Author:     Eiichi Tsukata <[email protected]>
AuthorDate: Thu, 11 Jul 2019 11:35:01 +0900
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 11 Jul 2019 08:22:03 +0200

x86/stacktrace: Prevent infinite loop in arch_stack_walk_user()

arch_stack_walk_user() checks if (fp == frame.next_fp) to prevent a infinite loop by self reference but it's not enogh for circular reference.

Once a lack of return address is found, there is no point to continue the loop, so break out.

Fixes 02b67518e2b1 ("tracing: add support for userspace stacktraces in tracing/iter_ctrl")
---
 arch/x86/kernel/stacktrace.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
arch/x86/kernel/stacktrace.c +3 -5
index 2abf27d7df6b..4f36d3241faf 100644
@@ -129,11 +129,9 @@ void arch_stack_walk_user(stack_trace_consume_fn consume_entry, void *cookie,
 			break;
 		if ((unsigned long)fp < regs->sp)
 			break;
-		if (frame.ret_addr) {
-			if (!consume_entry(cookie, frame.ret_addr, false))
-				return;
-		}
-		if (fp == frame.next_fp)
+		if (!frame.ret_addr)
+			break;
+		if (!consume_entry(cookie, frame.ret_addr, false))
 			break;
 		fp = frame.next_fp;
 	}