Commit 478b1799 authored Apr 10, 2018 by Joe Perches Committed by Linus Torvalds Apr 11, 2018

checkpatch: improve get_quoted_string for TRACE_EVENT macros

The get_quoted_string function does not expect invalid arguments.

The $stat test can return non-statements for complicated macros like
TRACE_EVENT.

Allow the $stat block and test for vsprintf misuses to exceed the actual
block length and possibly test invalid lines by validating the arguments
of get_quoted_string.

Return "" if either get_quoted_string argument is undefined.

Miscellanea:

o Properly align the comment for the vsprintf extension test

Link: http://lkml.kernel.org/r/9e9725342ca3dfc0f5e3e0b8ca3c482b0e5712cc.1520356392.git.joe@perches.com


Signed-off-by: Joe Perches <joe@perches.com>
Reported-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent e3c6bc95

scripts/checkpatch.pl

+2 −1

Original line number	Diff line number	Diff line
		@@ -1298,6 +1298,7 @@ sub sanitise_line {
		sub get_quoted_string {
		my ($line, $rawline) = @_;

		return "" if (!defined($line) \|\| !defined($rawline));
		return "" if ($line !~ m/($String)/g);
		return substr($rawline, $-[0], $+[0] - $-[0]);
		}

Admin message