checkpatch: possible types -- prevent illegal modifiers being added (9a974fdb) · Commits · 戴 / test

scripts/checkpatch.pl

+12 −8

Original line number	Diff line number	Diff line
		@@ -997,23 +997,25 @@ sub annotate_values {

		sub possible {
		my ($possible, $line) = @_;

		print "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);
		if ($possible !~ /(?:
		my $notPermitted = qr{(?:
		^(?:
		$Modifier\|
		$Storage\|
		$Type\|
		DEFINE_\S+\|
		DEFINE_\S+
		)$\|
		^(?:
		goto\|
		return\|
		case\|
		else\|
		asm\|__asm__\|
		do
		)$\|
		)(?:\s\|$)\|
		^(?:typedef\|struct\|enum)\b
		)/x) {
		)}x;
		warn "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);
		if ($possible !~ $notPermitted) {
		# Check for modifiers.
		$possible =~ s/\s$Storage\s//g;
		$possible =~ s/\s$Sparse\s//g;
		@@ -1022,9 +1024,11 @@ sub possible {
		} elsif ($possible =~ /\s/) {
		$possible =~ s/\s$Type\s//g;
		for my $modifier (split(' ', $possible)) {
		if ($modifier !~ $notPermitted) {
		warn "MODIFIER: $modifier ($possible) ($line)\n" if ($dbg_possible);
		push(@modifierList, $modifier);
		}
		}

		} else {
		warn "POSSIBLE: $possible ($line)\n" if ($dbg_possible);