[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: fd7b4f9f46d46acbc7af3a439bb0d869efdc5c58
WARNING: Author mismatch between patch and upstream commit:
Backport author: Wenshan Lan <jetlan9@xxxxxxx>
Commit author: Qun-Wei Lin <qun-wei.lin@xxxxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
1: fd7b4f9f46d4 ! 1: 3e999d5c22ab sched/task_stack: fix object_is_on_stack() for KASAN tagged pointers
@@ Metadata
## Commit message ##
sched/task_stack: fix object_is_on_stack() for KASAN tagged pointers
+ [ Upstream commit fd7b4f9f46d46acbc7af3a439bb0d869efdc5c58 ]
+
When CONFIG_KASAN_SW_TAGS and CONFIG_KASAN_STACK are enabled, the
object_is_on_stack() function may produce incorrect results due to the
presence of tags in the obj pointer, while the stack pointer does not have
@@ Commit message
Cc: Shakeel Butt <shakeel.butt@xxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
+ [ Resolve line conflicts ]
+ Signed-off-by: Wenshan Lan <jetlan9@xxxxxxx>
## include/linux/sched/task_stack.h ##
@@
+
#include <linux/sched.h>
#include <linux/magic.h>
- #include <linux/refcount.h>
+#include <linux/kasan.h>
#ifdef CONFIG_THREAD_INFO_IN_TASK
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
