riscv: ptdump: Replace unbounded sprintf() in dump_prot()
PATCH 1/1 riscv: ptdump: Replace unbounded sprintf() in dump_prot()
Replace the unbounded sprintf("%s", ...) with the faster and safer strscpy(). Replace all other sprintf() calls with the safer snprintf().
Signed-off-by Thorsten Blum <[email protected]>
--- arch/riscv/mm/ptdump.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/riscv/mm/ptdump.c +7 -6
@@ -7,6 +7,7 @@#include <linux/init.h> #include <linux/debugfs.h> #include <linux/seq_file.h> +#include <linux/string.h> #include <linux/ptdump.h> #include <linux/pgtable.h>
@@ -213,21 +214,21 @@ static void dump_prot(struct pg_state *st) val = st->current_prot & pte_bits[i].mask;if (val) {if (pte_bits[i].mask == _PAGE_SOFT) -sprintf (s, pte_bits[i].set, val >>8 ); +snprintf (s,sizeof (s), pte_bits[i].set, val >>8 );#ifdef CONFIG_64BIT else if (pte_bits[i].mask == _PAGE_MTMASK_SVPBMT) {if (val == _PAGE_NOCACHE_SVPBMT) -sprintf (s, pte_bits[i].set,"NC" ); +snprintf (s,sizeof (s), pte_bits[i].set,"NC" );else if (val == _PAGE_IO_SVPBMT) -sprintf (s, pte_bits[i].set,"IO" ); +snprintf (s,sizeof (s), pte_bits[i].set,"IO" );else -sprintf (s, pte_bits[i].set,"??" ); +snprintf (s,sizeof (s), pte_bits[i].set,"??" ); }#endif else - sprintf(s, "%s", pte_bits[i].set); + strscpy(s, pte_bits[i].set); }else { -sprintf (s,"%s" , pte_bits[i].clear); +strscpy (s, pte_bits[i].clear); }pt_dump_seq_printf (st->seq," %s" , s);
Signature · 2 lines
Thorsten Blum <[email protected]> GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4
Paul Walmsley
maintainerQuoted 4 lines · Thorsten Blum
Replace the unbounded
sprintf("%s", ...)with the faster and saferstrscpy(). Replace all othersprintf()calls with the safersnprintf().Signed-off-by Thorsten Blum <[email protected]>
Thanks, queued for v7.1.
- Paul