netdev - RE: [PATCH] checkpatch: Add some --strict coding style checks

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <804857E1F29AAC47BF68C404FC60A1842A1D36@ORSMSX102.amr.corp.intel.com>
Date:	Fri, 24 Feb 2012 18:22:20 +0000
From:	"Allan, Bruce W" <bruce.w.allan@...el.com>
To:	Joe Perches <joe@...ches.com>
CC:	David Miller <davem@...emloft.net>,
	Andy Whitcroft <apw@...dowen.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	"andrei.emeltchenko.news@...il.com" 
	<andrei.emeltchenko.news@...il.com>,
	"linville@...driver.com" <linville@...driver.com>,
	"linux-wireless@...r.kernel.org" <linux-wireless@...r.kernel.org>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH] checkpatch: Add some --strict coding style checks

> -----Original Message-----
> From: Joe Perches [mailto:joe@...ches.com]
> Sent: Wednesday, February 22, 2012 7:44 PM
> To: Allan, Bruce W
> Cc: David Miller; Andy Whitcroft; Andrew Morton;
> andrei.emeltchenko.news@...il.com; linville@...driver.com; linux-
> wireless@...r.kernel.org; netdev@...r.kernel.org; linux-
> kernel@...r.kernel.org
> Subject: RE: [PATCH] checkpatch: Add some --strict coding style checks
> 
> Hi Bruce. (yay, I got your name right)
> 
> Thanks.
> 
> How about testing this?
> 
> It allows all spaces or appropriate tabs for indentation,
> and I believe it works OK.
> 
> ---
>  scripts/checkpatch.pl |   65
> +++++++++++++++++++++++++++++++++++++++++++++++-
>  1 files changed, 63 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 89d24b3..7a0514b 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -330,10 +330,11 @@ sub build_types {
>  }
>  build_types();
> 
> -our $match_balanced_parentheses = qr/(\((?:[^\(\)]+|(-1))*\))/;
> +our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;
> +our $lval_parens = qr/(\((?:[^\(\)]+|(-1))*\))/;
> 
>  our $Typecast	= qr{\s*(\(\s*$NonptrType\s*\)){0,1}\s*};
> -our $LvalOrFunc	=
> qr{($Lval)\s*($match_balanced_parentheses{0,1})\s*};
> +our $LvalOrFunc	= qr{($Lval)\s*($lval_parens{0,1})\s*};
>  our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)};
> 
>  sub deparenthesize {
> @@ -1330,6 +1331,36 @@ sub check_absolute_file {
>  	}
>  }
> 
> +sub pos_last_openparen {
> +	my ($line) = @_;
> +
> +	my $pos = 0;
> +
> +	my $opens = $line =~ tr/\(/\(/;
> +	my $closes = $line =~ tr/\)/\)/;
> +
> +	my $last_openparen = 0;
> +
> +	if (($opens == 0) || ($closes >= $opens)) {
> +		return -1;
> +	}
> +
> +	my $len = length($line);
> +
> +	for ($pos = 0; $pos < $len; $pos++) {
> +	    my $string = substr($line, $pos);
> +	    if ($string =~ /^($FuncArg|$balanced_parens)/) {
> +		    $pos += length($1);
> +	    }
> +
> +	    if (substr($line, $pos, 1) eq '(') {
> +		$last_openparen = $pos;
> +	    }
> +	}
> +
> +	return $last_openparen + 1;
> +}
> +
>  sub process {
>  	my $filename = shift;
> 
> @@ -1783,6 +1814,36 @@ sub process {
>  			     "please, no space before tabs\n" . $herevet);
>  		}
> 
> +# check for && or || at the start of a line
> +		if ($rawline =~ /^\+\s*(&&|\|\|)/) {
> +			CHK("LOGICAL_CONTINUATIONS",
> +			    "Logical continuations should be on the previous
> line\n" . $hereprev);
> +		}
> +
> +# check multi-line statement indentation matches previous line
> +		if ($prevline =~ /^\+(\t*)(if
> \(|$Ident\().*(\&\&|\|\||,)\s*$/) {
> +			$prevline =~ /^\+(\t*)(.*)$/;
> +			my $oldindent = $1;
> +			my $rest = $2;
> +
> +			my $pos = pos_last_openparen($rest);
> +			if ($pos >= 0) {
> +				$line =~ /^\+([ \t]*)/;
> +				my $newindent = $1;
> +
> +				my $goodtabindent = $oldindent .
> +					"\t" x ($pos / 8) .
> +					" "  x ($pos % 8);
> +				my $goodspaceindent = $oldindent . " "  x
> $pos;
> +
> +				if ($newindent ne $goodtabindent &&
> +				    $newindent ne $goodspaceindent) {
> +					CHK("PARENTHESIS_ALIGNMENT",
> +					    "Alignment should match open
> parenthesis\n" . $hereprev);
> +				}
> +			}
> +		}
> +
>  # check for spaces at the beginning of a line.
>  # Exceptions:
>  #  1) within comments
> 

This latest version is much better.  It does not report false positives in the
limited code I checked it against.

Bruce.