| Message ID | 20211213112034.2896536-2-heiko@sntech.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] riscv: prevent null-pointer dereference with sbi_remote_fence_i | expand |
On Mon, Dec 13, 2021 at 3:21 AM Heiko Stuebner <heiko@sntech.de> wrote: > > The mentioned function pointers get called from different sbi functions > which may get called from other areas of the kernel without fully > checking if the sbi initialization was done. SBI initialization happens in sbi_init which is called from setup_arch. setup_smp happens after that. Thus, there won't be an IPI issued before SMP is set up. For __sbi_set_timer, the first time it will be called from this path. time_init->timer_probe->riscv_timer_init_dt time_init is called from start_kernel after setup_arch. In fact, setup_arch is called very early in the start_kernel. Is there any other scenario where these SBI functions can be invoked before SBI is initialized ? > > So similarly to sbi_remote_fence_i, provide empty functions for them > to prevent any null-pointer dereferences in the future. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/riscv/kernel/sbi.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c > index 69d0a96b97d0..6a21345c6712 100644 > --- a/arch/riscv/kernel/sbi.c > +++ b/arch/riscv/kernel/sbi.c > @@ -14,6 +14,13 @@ > unsigned long sbi_spec_version __ro_after_init = SBI_SPEC_VERSION_DEFAULT; > EXPORT_SYMBOL(sbi_spec_version); > > +static void __sbi_set_timer_none(uint64_t stime_value) {} > + > +static int __sbi_send_ipi_none(const unsigned long *hart_mask) > +{ > + return -EOPNOTSUPP; > +} > + > static int __sbi_rfence_none(int fid, const unsigned long *hart_mask, > unsigned long start, unsigned long size, > unsigned long arg4, unsigned long arg5) > @@ -21,8 +28,9 @@ static int __sbi_rfence_none(int fid, const unsigned long *hart_mask, > return -EOPNOTSUPP; > } > > -static void (*__sbi_set_timer)(uint64_t stime) __ro_after_init; > -static int (*__sbi_send_ipi)(const unsigned long *hart_mask) __ro_after_init; > +static void (*__sbi_set_timer)(uint64_t stime) __ro_after_init = __sbi_set_timer_none; > +static int (*__sbi_send_ipi)(const unsigned long *hart_mask) > + __ro_after_init = __sbi_send_ipi_none; > static int (*__sbi_rfence)(int fid, const unsigned long *hart_mask, > unsigned long start, unsigned long size, > unsigned long arg4, unsigned long arg5) > -- > 2.30.2 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
Hi Atish, Am Dienstag, 14. Dezember 2021, 03:10:21 CET schrieb Atish Patra: > On Mon, Dec 13, 2021 at 3:21 AM Heiko Stuebner <heiko@sntech.de> wrote: > > > > The mentioned function pointers get called from different sbi functions > > which may get called from other areas of the kernel without fully > > checking if the sbi initialization was done. > > SBI initialization happens in sbi_init which is called from setup_arch. > setup_smp happens after that. Thus, there won't be an IPI issued > before SMP is set up. > > For __sbi_set_timer, the first time it will be called from this path. > time_init->timer_probe->riscv_timer_init_dt > > time_init is called from start_kernel after setup_arch. In fact, > setup_arch is called very early > in the start_kernel. > > Is there any other scenario where these SBI functions can be invoked > before SBI is initialized ? This patch is more of a second thought ;-) . I.e. I ran into the issue fixed in the first patch, and then tought it might be nice to also not have these other "dangling pointers" around. But yeah, it's not that probably that these two will get called accidentially. So I guess I'll let you decide on these two functions ;-) . Heiko > > > > So similarly to sbi_remote_fence_i, provide empty functions for them > > to prevent any null-pointer dereferences in the future. > > > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > > --- > > arch/riscv/kernel/sbi.c | 12 ++++++++++-- > > 1 file changed, 10 insertions(+), 2 deletions(-) > > > > diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c > > index 69d0a96b97d0..6a21345c6712 100644 > > --- a/arch/riscv/kernel/sbi.c > > +++ b/arch/riscv/kernel/sbi.c > > @@ -14,6 +14,13 @@ > > unsigned long sbi_spec_version __ro_after_init = SBI_SPEC_VERSION_DEFAULT; > > EXPORT_SYMBOL(sbi_spec_version); > > > > +static void __sbi_set_timer_none(uint64_t stime_value) {} > > + > > +static int __sbi_send_ipi_none(const unsigned long *hart_mask) > > +{ > > + return -EOPNOTSUPP; > > +} > > + > > static int __sbi_rfence_none(int fid, const unsigned long *hart_mask, > > unsigned long start, unsigned long size, > > unsigned long arg4, unsigned long arg5) > > @@ -21,8 +28,9 @@ static int __sbi_rfence_none(int fid, const unsigned long *hart_mask, > > return -EOPNOTSUPP; > > } > > > > -static void (*__sbi_set_timer)(uint64_t stime) __ro_after_init; > > -static int (*__sbi_send_ipi)(const unsigned long *hart_mask) __ro_after_init; > > +static void (*__sbi_set_timer)(uint64_t stime) __ro_after_init = __sbi_set_timer_none; > > +static int (*__sbi_send_ipi)(const unsigned long *hart_mask) > > + __ro_after_init = __sbi_send_ipi_none; > > static int (*__sbi_rfence)(int fid, const unsigned long *hart_mask, > > unsigned long start, unsigned long size, > > unsigned long arg4, unsigned long arg5) > > -- > > 2.30.2 > > > > > > _______________________________________________ > > linux-riscv mailing list > > linux-riscv@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-riscv > > > >
diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index 69d0a96b97d0..6a21345c6712 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -14,6 +14,13 @@ unsigned long sbi_spec_version __ro_after_init = SBI_SPEC_VERSION_DEFAULT; EXPORT_SYMBOL(sbi_spec_version); +static void __sbi_set_timer_none(uint64_t stime_value) {} + +static int __sbi_send_ipi_none(const unsigned long *hart_mask) +{ + return -EOPNOTSUPP; +} + static int __sbi_rfence_none(int fid, const unsigned long *hart_mask, unsigned long start, unsigned long size, unsigned long arg4, unsigned long arg5) @@ -21,8 +28,9 @@ static int __sbi_rfence_none(int fid, const unsigned long *hart_mask, return -EOPNOTSUPP; } -static void (*__sbi_set_timer)(uint64_t stime) __ro_after_init; -static int (*__sbi_send_ipi)(const unsigned long *hart_mask) __ro_after_init; +static void (*__sbi_set_timer)(uint64_t stime) __ro_after_init = __sbi_set_timer_none; +static int (*__sbi_send_ipi)(const unsigned long *hart_mask) + __ro_after_init = __sbi_send_ipi_none; static int (*__sbi_rfence)(int fid, const unsigned long *hart_mask, unsigned long start, unsigned long size, unsigned long arg4, unsigned long arg5)
The mentioned function pointers get called from different sbi functions which may get called from other areas of the kernel without fully checking if the sbi initialization was done. So similarly to sbi_remote_fence_i, provide empty functions for them to prevent any null-pointer dereferences in the future. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- arch/riscv/kernel/sbi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)