| Message ID | 20240125062739.1339782-25-debug@rivosinc.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
| Series | riscv control-flow integrity for usermode | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Wed, Jan 24, 2024 at 10:21:49PM -0800, debug@rivosinc.com wrote: > From: Deepak Gupta <debug@rivosinc.com> > > This patch selects config shadow stack support and landing pad instr > support. Shadow stack support and landing instr support is hidden behind > `CONFIG_RISCV_USER_CFI`. Selecting `CONFIG_RISCV_USER_CFI` wires up path > to enumerate CPU support and if cpu support exists, kernel will support > cpu assisted user mode cfi. > > Signed-off-by: Deepak Gupta <debug@rivosinc.com> > --- > arch/riscv/Kconfig | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 9d386e9edc45..437b2f9abf3e 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -163,6 +163,7 @@ config RISCV > select SYSCTL_EXCEPTION_TRACE > select THREAD_INFO_IN_TASK > select TRACE_IRQFLAGS_SUPPORT > + select RISCV_USER_CFI This select makes no sense to me, it will unconditionally enable RISCV_USER_CFI. I don't think that that is your intent, since you have a detailed option below that allows the user to turn it on or off. If you remove it, the commit message will need to change too FYI. Thanks, Conor. > select UACCESS_MEMCPY if !MMU > select ZONE_DMA32 if 64BIT > > @@ -182,6 +183,20 @@ config HAVE_SHADOW_CALL_STACK > # https://github.com/riscv-non-isa/riscv-elf-psabi-doc/commit/a484e843e6eeb51f0cb7b8819e50da6d2444d769 > depends on $(ld-option,--no-relax-gp) > > +config RISCV_USER_CFI > + bool "riscv userspace control flow integrity" > + help > + Provides CPU assisted control flow integrity to userspace tasks. > + Control flow integrity is provided by implementing shadow stack for > + backward edge and indirect branch tracking for forward edge in program. > + Shadow stack protection is a hardware feature that detects function > + return address corruption. This helps mitigate ROP attacks. > + Indirect branch tracking enforces that all indirect branches must land > + on a landing pad instruction else CPU will fault. This mitigates against > + JOP / COP attacks. Applications must be enabled to use it, and old user- > + space does not get protection "for free". > + default y > + > config ARCH_MMAP_RND_BITS_MIN > default 18 if 64BIT > default 8 > -- > 2.43.0 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
On Thu, Jan 25, 2024 at 06:04:26PM +0000, Conor Dooley wrote: >On Wed, Jan 24, 2024 at 10:21:49PM -0800, debug@rivosinc.com wrote: >> From: Deepak Gupta <debug@rivosinc.com> >> >> This patch selects config shadow stack support and landing pad instr >> support. Shadow stack support and landing instr support is hidden behind >> `CONFIG_RISCV_USER_CFI`. Selecting `CONFIG_RISCV_USER_CFI` wires up path >> to enumerate CPU support and if cpu support exists, kernel will support >> cpu assisted user mode cfi. >> >> Signed-off-by: Deepak Gupta <debug@rivosinc.com> >> --- >> arch/riscv/Kconfig | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig >> index 9d386e9edc45..437b2f9abf3e 100644 >> --- a/arch/riscv/Kconfig >> +++ b/arch/riscv/Kconfig >> @@ -163,6 +163,7 @@ config RISCV >> select SYSCTL_EXCEPTION_TRACE >> select THREAD_INFO_IN_TASK >> select TRACE_IRQFLAGS_SUPPORT >> + select RISCV_USER_CFI > >This select makes no sense to me, it will unconditionally enable >RISCV_USER_CFI. I don't think that that is your intent, since you have a >detailed option below that allows the user to turn it on or off. > >If you remove it, the commit message will need to change too FYI. > Selecting this config puts support in Kernel so that it can run tasks who wants to enable hardware assisted control flow integrity for themselves. But apps still always need to optin using `prctls`. Those prctls are stubs and return EINVAL when this config is not selected. Not selecting this config means, kernel will not support enabling this feature for user mode. I'll edit commit message to better reflect this. >Thanks, >Conor. > >> select UACCESS_MEMCPY if !MMU >> select ZONE_DMA32 if 64BIT >> >> @@ -182,6 +183,20 @@ config HAVE_SHADOW_CALL_STACK >> # https://github.com/riscv-non-isa/riscv-elf-psabi-doc/commit/a484e843e6eeb51f0cb7b8819e50da6d2444d769 >> depends on $(ld-option,--no-relax-gp) >> >> +config RISCV_USER_CFI >> + bool "riscv userspace control flow integrity" >> + help >> + Provides CPU assisted control flow integrity to userspace tasks. >> + Control flow integrity is provided by implementing shadow stack for >> + backward edge and indirect branch tracking for forward edge in program. >> + Shadow stack protection is a hardware feature that detects function >> + return address corruption. This helps mitigate ROP attacks. >> + Indirect branch tracking enforces that all indirect branches must land >> + on a landing pad instruction else CPU will fault. This mitigates against >> + JOP / COP attacks. Applications must be enabled to use it, and old user- >> + space does not get protection "for free". >> + default y >> + >> config ARCH_MMAP_RND_BITS_MIN >> default 18 if 64BIT >> default 8 >> -- >> 2.43.0 >> >> >> _______________________________________________ >> linux-riscv mailing list >> linux-riscv@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-riscv
On Thu, Jan 25, 2024 at 10:12:16AM -0800, Deepak Gupta wrote: > On Thu, Jan 25, 2024 at 06:04:26PM +0000, Conor Dooley wrote: > > On Wed, Jan 24, 2024 at 10:21:49PM -0800, debug@rivosinc.com wrote: > > > From: Deepak Gupta <debug@rivosinc.com> > > > > > > This patch selects config shadow stack support and landing pad instr > > > support. Shadow stack support and landing instr support is hidden behind > > > `CONFIG_RISCV_USER_CFI`. Selecting `CONFIG_RISCV_USER_CFI` wires up path > > > to enumerate CPU support and if cpu support exists, kernel will support > > > cpu assisted user mode cfi. > > > > > > Signed-off-by: Deepak Gupta <debug@rivosinc.com> > > > --- > > > arch/riscv/Kconfig | 15 +++++++++++++++ > > > 1 file changed, 15 insertions(+) > > > > > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > > > index 9d386e9edc45..437b2f9abf3e 100644 > > > --- a/arch/riscv/Kconfig > > > +++ b/arch/riscv/Kconfig > > > @@ -163,6 +163,7 @@ config RISCV > > > select SYSCTL_EXCEPTION_TRACE > > > select THREAD_INFO_IN_TASK > > > select TRACE_IRQFLAGS_SUPPORT > > > + select RISCV_USER_CFI > > > > This select makes no sense to me, it will unconditionally enable > > RISCV_USER_CFI. I don't think that that is your intent, since you have a > > detailed option below that allows the user to turn it on or off. > > > > If you remove it, the commit message will need to change too FYI. > > > > Selecting this config puts support in Kernel so that it can run tasks who wants > to enable hardware assisted control flow integrity for themselves. But apps still > always need to optin using `prctls`. Those prctls are stubs and return EINVAL when > this config is not selected. Not selecting this config means, kernel will not support > enabling this feature for user mode. I don't think you understand me. "select RISCV_USER_CFI" will unconditionally build it into the kernel, making stubs etc useless. You're talking like (and the rest of your commit implements it!) that this feature can be enabled in menuconfig etc. Having this select will always enable the config option, rendering the choice below redundant. Try turning it off in menuconfig. Oh and if it were valid to have here, you put it in out of order. That's an alphanumerically sorted list :) Cheers, Conor.
On Thu, Jan 25, 2024 at 06:44:48PM +0000, Conor Dooley wrote: >On Thu, Jan 25, 2024 at 10:12:16AM -0800, Deepak Gupta wrote: >> On Thu, Jan 25, 2024 at 06:04:26PM +0000, Conor Dooley wrote: >> > On Wed, Jan 24, 2024 at 10:21:49PM -0800, debug@rivosinc.com wrote: >> > > From: Deepak Gupta <debug@rivosinc.com> >> > > >> > > This patch selects config shadow stack support and landing pad instr >> > > support. Shadow stack support and landing instr support is hidden behind >> > > `CONFIG_RISCV_USER_CFI`. Selecting `CONFIG_RISCV_USER_CFI` wires up path >> > > to enumerate CPU support and if cpu support exists, kernel will support >> > > cpu assisted user mode cfi. >> > > >> > > Signed-off-by: Deepak Gupta <debug@rivosinc.com> >> > > --- >> > > arch/riscv/Kconfig | 15 +++++++++++++++ >> > > 1 file changed, 15 insertions(+) >> > > >> > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig >> > > index 9d386e9edc45..437b2f9abf3e 100644 >> > > --- a/arch/riscv/Kconfig >> > > +++ b/arch/riscv/Kconfig >> > > @@ -163,6 +163,7 @@ config RISCV >> > > select SYSCTL_EXCEPTION_TRACE >> > > select THREAD_INFO_IN_TASK >> > > select TRACE_IRQFLAGS_SUPPORT >> > > + select RISCV_USER_CFI >> > >> > This select makes no sense to me, it will unconditionally enable >> > RISCV_USER_CFI. I don't think that that is your intent, since you have a >> > detailed option below that allows the user to turn it on or off. >> > >> > If you remove it, the commit message will need to change too FYI. >> > >> >> Selecting this config puts support in Kernel so that it can run tasks who wants >> to enable hardware assisted control flow integrity for themselves. But apps still >> always need to optin using `prctls`. Those prctls are stubs and return EINVAL when >> this config is not selected. Not selecting this config means, kernel will not support >> enabling this feature for user mode. > >I don't think you understand me. "select RISCV_USER_CFI" will >unconditionally build it into the kernel, making stubs etc useless. >You're talking like (and the rest of your commit implements it!) that >this feature can be enabled in menuconfig etc. Having this select >will always enable the config option, rendering the choice below >redundant. Try turning it off in menuconfig. Aah got it now. Thanks. I'll fix this messaging and select in next version. > >Oh and if it were valid to have here, you put it in out of order. That's >an alphanumerically sorted list :) Thanks for pointing that out. Will fix it. > >Cheers, >Conor. >
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 9d386e9edc45..437b2f9abf3e 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -163,6 +163,7 @@ config RISCV select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK select TRACE_IRQFLAGS_SUPPORT + select RISCV_USER_CFI select UACCESS_MEMCPY if !MMU select ZONE_DMA32 if 64BIT @@ -182,6 +183,20 @@ config HAVE_SHADOW_CALL_STACK # https://github.com/riscv-non-isa/riscv-elf-psabi-doc/commit/a484e843e6eeb51f0cb7b8819e50da6d2444d769 depends on $(ld-option,--no-relax-gp) +config RISCV_USER_CFI + bool "riscv userspace control flow integrity" + help + Provides CPU assisted control flow integrity to userspace tasks. + Control flow integrity is provided by implementing shadow stack for + backward edge and indirect branch tracking for forward edge in program. + Shadow stack protection is a hardware feature that detects function + return address corruption. This helps mitigate ROP attacks. + Indirect branch tracking enforces that all indirect branches must land + on a landing pad instruction else CPU will fault. This mitigates against + JOP / COP attacks. Applications must be enabled to use it, and old user- + space does not get protection "for free". + default y + config ARCH_MMAP_RND_BITS_MIN default 18 if 64BIT default 8