Message ID | 20140630203759.GA4764@www.outflux.net |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
On Mon, Jun 30, 2014 at 01:37:59PM -0700, Kees Cook wrote: > Since unaligned_panic() takes a literal string, make sure it can never > accidentally be used as a format string. > > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > arch/sparc/kernel/unaligned_32.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c > index c5c61b3c6b56..32b61d1b6379 100644 > --- a/arch/sparc/kernel/unaligned_32.c > +++ b/arch/sparc/kernel/unaligned_32.c > @@ -166,7 +166,7 @@ unsigned long safe_compute_effective_address(struct pt_regs *regs, > /* This is just to make gcc think panic does return... */ > static void unaligned_panic(char *str) > { > - panic(str); > + panic("%s", str); > } > > /* una_asm.S */ The feedback last time was that this patch is silly. panic() has only two callsites within the same file. Sam -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Kees Cook <keescook@chromium.org> Date: Mon, 30 Jun 2014 13:37:59 -0700 > Since unaligned_panic() takes a literal string, make sure it can never > accidentally be used as a format string. > > Signed-off-by: Kees Cook <keescook@chromium.org> Unnecessary, but harmless, so applied to sparc-next, thanks. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c index c5c61b3c6b56..32b61d1b6379 100644 --- a/arch/sparc/kernel/unaligned_32.c +++ b/arch/sparc/kernel/unaligned_32.c @@ -166,7 +166,7 @@ unsigned long safe_compute_effective_address(struct pt_regs *regs, /* This is just to make gcc think panic does return... */ static void unaligned_panic(char *str) { - panic(str); + panic("%s", str); } /* una_asm.S */
Since unaligned_panic() takes a literal string, make sure it can never accidentally be used as a format string. Signed-off-by: Kees Cook <keescook@chromium.org> --- arch/sparc/kernel/unaligned_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)