* [PATCH] riscv: Randomize lower bits of stack address
@ 2024-06-25 3:05 Yunhui Cui
2024-07-11 6:09 ` yunhui cui
2024-09-17 16:30 ` patchwork-bot+linux-riscv
0 siblings, 2 replies; 5+ messages in thread
From: Yunhui Cui @ 2024-06-25 3:05 UTC (permalink / raw)
To: paul.walmsley, palmer, aou, cuiyunhui, andy.chiu, alexghiti,
conor.dooley, bjorn, sorear, cleger, linux-riscv, linux-kernel
Implement arch_align_stack() to randomize the lower bits
of the stack address.
Signed-off-by: Yunhui Cui <cuiyunhui@bytedance.com>
---
arch/riscv/include/asm/exec.h | 8 ++++++++
arch/riscv/kernel/process.c | 9 +++++++++
2 files changed, 17 insertions(+)
create mode 100644 arch/riscv/include/asm/exec.h
diff --git a/arch/riscv/include/asm/exec.h b/arch/riscv/include/asm/exec.h
new file mode 100644
index 000000000000..07d9942682e0
--- /dev/null
+++ b/arch/riscv/include/asm/exec.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_EXEC_H
+#define __ASM_EXEC_H
+
+extern unsigned long arch_align_stack(unsigned long sp);
+
+#endif /* __ASM_EXEC_H */
diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c
index e4bc61c4e58a..e3142d8a6e28 100644
--- a/arch/riscv/kernel/process.c
+++ b/arch/riscv/kernel/process.c
@@ -15,6 +15,7 @@
#include <linux/tick.h>
#include <linux/ptrace.h>
#include <linux/uaccess.h>
+#include <linux/personality.h>
#include <asm/unistd.h>
#include <asm/processor.h>
@@ -26,6 +27,7 @@
#include <asm/cpuidle.h>
#include <asm/vector.h>
#include <asm/cpufeature.h>
+#include <asm/exec.h>
#if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK)
#include <linux/stackprotector.h>
@@ -99,6 +101,13 @@ void show_regs(struct pt_regs *regs)
dump_backtrace(regs, NULL, KERN_DEFAULT);
}
+unsigned long arch_align_stack(unsigned long sp)
+{
+ if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
+ sp -= get_random_u32_below(PAGE_SIZE);
+ return sp & ~0xf;
+}
+
#ifdef CONFIG_COMPAT
static bool compat_mode_supported __read_mostly;
--
2.20.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] riscv: Randomize lower bits of stack address
2024-06-25 3:05 [PATCH] riscv: Randomize lower bits of stack address Yunhui Cui
@ 2024-07-11 6:09 ` yunhui cui
2024-08-15 2:08 ` yunhui cui
2024-09-17 16:30 ` patchwork-bot+linux-riscv
1 sibling, 1 reply; 5+ messages in thread
From: yunhui cui @ 2024-07-11 6:09 UTC (permalink / raw)
To: paul.walmsley, palmer, aou, cuiyunhui, andy.chiu, alexghiti,
conor.dooley, bjorn, sorear, cleger, linux-riscv, linux-kernel,
punit.agrawal
Add punit in the loop.
On Tue, Jun 25, 2024 at 11:05 AM Yunhui Cui <cuiyunhui@bytedance.com> wrote:
>
> Implement arch_align_stack() to randomize the lower bits
> of the stack address.
>
> Signed-off-by: Yunhui Cui <cuiyunhui@bytedance.com>
> ---
> arch/riscv/include/asm/exec.h | 8 ++++++++
> arch/riscv/kernel/process.c | 9 +++++++++
> 2 files changed, 17 insertions(+)
> create mode 100644 arch/riscv/include/asm/exec.h
>
> diff --git a/arch/riscv/include/asm/exec.h b/arch/riscv/include/asm/exec.h
> new file mode 100644
> index 000000000000..07d9942682e0
> --- /dev/null
> +++ b/arch/riscv/include/asm/exec.h
> @@ -0,0 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +
> +#ifndef __ASM_EXEC_H
> +#define __ASM_EXEC_H
> +
> +extern unsigned long arch_align_stack(unsigned long sp);
> +
> +#endif /* __ASM_EXEC_H */
> diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c
> index e4bc61c4e58a..e3142d8a6e28 100644
> --- a/arch/riscv/kernel/process.c
> +++ b/arch/riscv/kernel/process.c
> @@ -15,6 +15,7 @@
> #include <linux/tick.h>
> #include <linux/ptrace.h>
> #include <linux/uaccess.h>
> +#include <linux/personality.h>
>
> #include <asm/unistd.h>
> #include <asm/processor.h>
> @@ -26,6 +27,7 @@
> #include <asm/cpuidle.h>
> #include <asm/vector.h>
> #include <asm/cpufeature.h>
> +#include <asm/exec.h>
>
> #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK)
> #include <linux/stackprotector.h>
> @@ -99,6 +101,13 @@ void show_regs(struct pt_regs *regs)
> dump_backtrace(regs, NULL, KERN_DEFAULT);
> }
>
> +unsigned long arch_align_stack(unsigned long sp)
> +{
> + if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
> + sp -= get_random_u32_below(PAGE_SIZE);
> + return sp & ~0xf;
> +}
> +
> #ifdef CONFIG_COMPAT
> static bool compat_mode_supported __read_mostly;
>
> --
> 2.20.1
>
Thanks,
Yunhui
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] riscv: Randomize lower bits of stack address
2024-07-11 6:09 ` yunhui cui
@ 2024-08-15 2:08 ` yunhui cui
2024-08-15 5:37 ` Alexandre Ghiti
0 siblings, 1 reply; 5+ messages in thread
From: yunhui cui @ 2024-08-15 2:08 UTC (permalink / raw)
To: paul.walmsley, palmer, aou, cuiyunhui, andy.chiu, alexghiti,
conor.dooley, bjorn, sorear, cleger, linux-riscv, linux-kernel,
punit.agrawal
A gentle ping, Any more comments on this patch?
On Thu, Jul 11, 2024 at 2:09 PM yunhui cui <cuiyunhui@bytedance.com> wrote:
>
> Add punit in the loop.
>
>
> On Tue, Jun 25, 2024 at 11:05 AM Yunhui Cui <cuiyunhui@bytedance.com> wrote:
> >
> > Implement arch_align_stack() to randomize the lower bits
> > of the stack address.
> >
> > Signed-off-by: Yunhui Cui <cuiyunhui@bytedance.com>
> > ---
> > arch/riscv/include/asm/exec.h | 8 ++++++++
> > arch/riscv/kernel/process.c | 9 +++++++++
> > 2 files changed, 17 insertions(+)
> > create mode 100644 arch/riscv/include/asm/exec.h
> >
> > diff --git a/arch/riscv/include/asm/exec.h b/arch/riscv/include/asm/exec.h
> > new file mode 100644
> > index 000000000000..07d9942682e0
> > --- /dev/null
> > +++ b/arch/riscv/include/asm/exec.h
> > @@ -0,0 +1,8 @@
> > +/* SPDX-License-Identifier: GPL-2.0-only */
> > +
> > +#ifndef __ASM_EXEC_H
> > +#define __ASM_EXEC_H
> > +
> > +extern unsigned long arch_align_stack(unsigned long sp);
> > +
> > +#endif /* __ASM_EXEC_H */
> > diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c
> > index e4bc61c4e58a..e3142d8a6e28 100644
> > --- a/arch/riscv/kernel/process.c
> > +++ b/arch/riscv/kernel/process.c
> > @@ -15,6 +15,7 @@
> > #include <linux/tick.h>
> > #include <linux/ptrace.h>
> > #include <linux/uaccess.h>
> > +#include <linux/personality.h>
> >
> > #include <asm/unistd.h>
> > #include <asm/processor.h>
> > @@ -26,6 +27,7 @@
> > #include <asm/cpuidle.h>
> > #include <asm/vector.h>
> > #include <asm/cpufeature.h>
> > +#include <asm/exec.h>
> >
> > #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK)
> > #include <linux/stackprotector.h>
> > @@ -99,6 +101,13 @@ void show_regs(struct pt_regs *regs)
> > dump_backtrace(regs, NULL, KERN_DEFAULT);
> > }
> >
> > +unsigned long arch_align_stack(unsigned long sp)
> > +{
> > + if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
> > + sp -= get_random_u32_below(PAGE_SIZE);
> > + return sp & ~0xf;
> > +}
> > +
> > #ifdef CONFIG_COMPAT
> > static bool compat_mode_supported __read_mostly;
> >
> > --
> > 2.20.1
> >
>
> Thanks,
> Yunhui
Thanks,
Yunhui
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] riscv: Randomize lower bits of stack address
2024-08-15 2:08 ` yunhui cui
@ 2024-08-15 5:37 ` Alexandre Ghiti
0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Ghiti @ 2024-08-15 5:37 UTC (permalink / raw)
To: yunhui cui, Kees Cook
Cc: paul.walmsley, palmer, aou, andy.chiu, conor.dooley, bjorn,
sorear, cleger, linux-riscv, linux-kernel, punit.agrawal
Hi Yunhui,
On Thu, Aug 15, 2024 at 4:08 AM yunhui cui <cuiyunhui@bytedance.com> wrote:
>
> A gentle ping, Any more comments on this patch?
I'm adding @Kees Cook in cc in case he has any.
Thanks,
Alex
>
> On Thu, Jul 11, 2024 at 2:09 PM yunhui cui <cuiyunhui@bytedance.com> wrote:
> >
> > Add punit in the loop.
> >
> >
> > On Tue, Jun 25, 2024 at 11:05 AM Yunhui Cui <cuiyunhui@bytedance.com> wrote:
> > >
> > > Implement arch_align_stack() to randomize the lower bits
> > > of the stack address.
> > >
> > > Signed-off-by: Yunhui Cui <cuiyunhui@bytedance.com>
> > > ---
> > > arch/riscv/include/asm/exec.h | 8 ++++++++
> > > arch/riscv/kernel/process.c | 9 +++++++++
> > > 2 files changed, 17 insertions(+)
> > > create mode 100644 arch/riscv/include/asm/exec.h
> > >
> > > diff --git a/arch/riscv/include/asm/exec.h b/arch/riscv/include/asm/exec.h
> > > new file mode 100644
> > > index 000000000000..07d9942682e0
> > > --- /dev/null
> > > +++ b/arch/riscv/include/asm/exec.h
> > > @@ -0,0 +1,8 @@
> > > +/* SPDX-License-Identifier: GPL-2.0-only */
> > > +
> > > +#ifndef __ASM_EXEC_H
> > > +#define __ASM_EXEC_H
> > > +
> > > +extern unsigned long arch_align_stack(unsigned long sp);
> > > +
> > > +#endif /* __ASM_EXEC_H */
> > > diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c
> > > index e4bc61c4e58a..e3142d8a6e28 100644
> > > --- a/arch/riscv/kernel/process.c
> > > +++ b/arch/riscv/kernel/process.c
> > > @@ -15,6 +15,7 @@
> > > #include <linux/tick.h>
> > > #include <linux/ptrace.h>
> > > #include <linux/uaccess.h>
> > > +#include <linux/personality.h>
> > >
> > > #include <asm/unistd.h>
> > > #include <asm/processor.h>
> > > @@ -26,6 +27,7 @@
> > > #include <asm/cpuidle.h>
> > > #include <asm/vector.h>
> > > #include <asm/cpufeature.h>
> > > +#include <asm/exec.h>
> > >
> > > #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK)
> > > #include <linux/stackprotector.h>
> > > @@ -99,6 +101,13 @@ void show_regs(struct pt_regs *regs)
> > > dump_backtrace(regs, NULL, KERN_DEFAULT);
> > > }
> > >
> > > +unsigned long arch_align_stack(unsigned long sp)
> > > +{
> > > + if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
> > > + sp -= get_random_u32_below(PAGE_SIZE);
> > > + return sp & ~0xf;
> > > +}
> > > +
> > > #ifdef CONFIG_COMPAT
> > > static bool compat_mode_supported __read_mostly;
> > >
> > > --
> > > 2.20.1
> > >
> >
> > Thanks,
> > Yunhui
>
> Thanks,
> Yunhui
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] riscv: Randomize lower bits of stack address
2024-06-25 3:05 [PATCH] riscv: Randomize lower bits of stack address Yunhui Cui
2024-07-11 6:09 ` yunhui cui
@ 2024-09-17 16:30 ` patchwork-bot+linux-riscv
1 sibling, 0 replies; 5+ messages in thread
From: patchwork-bot+linux-riscv @ 2024-09-17 16:30 UTC (permalink / raw)
To: yunhui cui
Cc: linux-riscv, paul.walmsley, palmer, aou, andy.chiu, alexghiti,
conor.dooley, bjorn, sorear, cleger, linux-kernel
Hello:
This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <palmer@rivosinc.com>:
On Tue, 25 Jun 2024 11:05:02 +0800 you wrote:
> Implement arch_align_stack() to randomize the lower bits
> of the stack address.
>
> Signed-off-by: Yunhui Cui <cuiyunhui@bytedance.com>
> ---
> arch/riscv/include/asm/exec.h | 8 ++++++++
> arch/riscv/kernel/process.c | 9 +++++++++
> 2 files changed, 17 insertions(+)
> create mode 100644 arch/riscv/include/asm/exec.h
Here is the summary with links:
- riscv: Randomize lower bits of stack address
https://git.kernel.org/riscv/c/048e2906d4ca
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-17 16:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-25 3:05 [PATCH] riscv: Randomize lower bits of stack address Yunhui Cui
2024-07-11 6:09 ` yunhui cui
2024-08-15 2:08 ` yunhui cui
2024-08-15 5:37 ` Alexandre Ghiti
2024-09-17 16:30 ` patchwork-bot+linux-riscv
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox