From: Will Deacon <will@kernel.org>
Date: Wed, 3 Jun 2020 11:16:37 +0000 (+0100)
Subject: scs: Report SCS usage in bytes rather than number of entries
X-Git-Tag: v5.8-rc1~44^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=333ed74689b8fca097574124fef7fa0e3d7f79d4;p=thirdparty%2Fkernel%2Flinux.git

scs: Report SCS usage in bytes rather than number of entries

Fix the SCS debug usage check so that we report the number of bytes
used, rather than the number of entries.

Fixes: 5bbaf9d1fcb9 ("scs: Add support for stack usage debugging")
Reported-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Will Deacon <will@kernel.org>
---

diff --git a/kernel/scs.c b/kernel/scs.c
index 222a7a9ad5439..5d4d9bbdec36c 100644
--- a/kernel/scs.c
+++ b/kernel/scs.c
@@ -74,7 +74,7 @@ static void scs_check_usage(struct task_struct *tsk)
 	for (p = task_scs(tsk); p < __scs_magic(tsk); ++p) {
 		if (!READ_ONCE_NOCHECK(*p))
 			break;
-		used++;
+		used += sizeof(*p);
 	}
 
 	while (used > curr) {