Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b0aa2c6..2d4ce15 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -7,6 +7,12 @@
use strict;
+use constant BEFORE_SHORTTEXT => 0;
+use constant IN_SHORTTEXT => 1;
+use constant AFTER_SHORTTEXT => 2;
+use constant CHECK_NEXT_SHORTTEXT => 3;
+use constant SHORTTEXT_LIMIT => 75;
+
my $P = $0;
$P =~ s@.*/@@g;
@@ -1155,6 +1161,8 @@
my $prevrawline="";
my $stashline="";
my $stashrawline="";
+ my $subjectline="";
+ my $sublinenr="";
my $length;
my $indent;
@@ -1194,8 +1202,36 @@
my @setup_docs = ();
my $setup_docs = 0;
+ my $in_code_block = 0;
+ my $exec_file = "";
+
+ my $shorttext = BEFORE_SHORTTEXT;
+ my $shorttext_exspc = 0;
+
sanitise_line_reset();
my $line;
+ # Before sanitizing the rawlines, collapse any header-continuation
+ # lines into a single line so they can be parsed meaningfully.
+ my $end_of_hdrs = 0;
+ foreach my $rawline (@rawlines) {
+ if ($rawline=~/^\s*$/) {
+ last;
+ } else {
+ $end_of_hdrs++;
+ }
+ }
+ my @continuation_hdrs;
+ foreach my $n (0 .. $end_of_hdrs) {
+ if ($rawlines[$n]=~/^\s+/) {
+ push @continuation_hdrs, $n;
+ }
+ }
+ while (my $n = pop @continuation_hdrs) {
+ $line = splice @rawlines, $n, 1;
+ $line=~s/^\s+/ /;
+ $rawlines[$n - 1] .= $line;
+ }
+
foreach my $rawline (@rawlines) {
$linenr++;
$line = $rawline;
@@ -1346,15 +1382,84 @@
if ($realfile =~ m@^include/asm/@) {
ERROR("do not modify files in include/asm, change architecture specific files in include/asm-<architecture>\n" . "$here$rawline\n");
}
+ $in_code_block = 1;
next;
}
-
+ elsif ($rawline =~ /^diff.+a\/(.+)\sb\/.+$/) {
+ $exec_file = $1;
+ $in_code_block = 0;
+ }
+ #Check state to make sure we aren't in code block.
+ elsif (!$in_code_block &&
+ ($exec_file =~ /^.+\.[chS]$/ or
+ $exec_file =~ /^.+\.txt$/ or
+ $exec_file =~ /^.+\.ihex$/ or
+ $exec_file =~ /^.+\.hex$/ or
+ $exec_file =~ /^.+\.HEX$/ or
+ $exec_file =~ /^.+defconfig$/ or
+ $exec_file =~ /^Makefile$/ or
+ $exec_file =~ /^Kconfig$/) &&
+ $rawline =~ /^new (file )?mode\s([0-9]+)$/ &&
+ (oct($2) & 0111)) {
+ ERROR("Source file has +x permissions: " .
+ "$exec_file\n");
+ }
$here .= "FILE: $realfile:$realline:" if ($realcnt != 0);
my $hereline = "$here\n$rawline\n";
my $herecurr = "$here\n$rawline\n";
my $hereprev = "$here\n$prevrawline\n$rawline\n";
+ if ($shorttext != AFTER_SHORTTEXT) {
+ if ($shorttext == IN_SHORTTEXT) {
+ if ($line=~/^---/ || $line=~/^diff.*/) {
+ $shorttext = AFTER_SHORTTEXT;
+ } elsif (length($line) > (SHORTTEXT_LIMIT +
+ $shorttext_exspc)
+ && $line !~ /^:([0-7]{6}\s){2}
+ ([[:xdigit:]]+\.*
+ \s){2}\w+\s\w+/xms) {
+ WARN("commit text line over " .
+ SHORTTEXT_LIMIT .
+ " characters\n" . $herecurr);
+ }
+ } elsif ($shorttext == CHECK_NEXT_SHORTTEXT) {
+# The Subject line doesn't have to be the last header in the patch.
+# Avoid moving to the IN_SHORTTEXT state until clear of all headers.
+# Per RFC5322, continuation lines must be folded, so any left-justified
+# text which looks like a header is definitely a header.
+ if ($line!~/^[\x21-\x39\x3b-\x7e]+:/) {
+ $shorttext = IN_SHORTTEXT;
+# Check for Subject line followed by a blank line.
+ if (length($line) != 0) {
+ WARN("non-blank line after " .
+ "summary line\n" .
+ $sublinenr . $here .
+ "\n" . $subjectline .
+ "\n" . $line . "\n");
+ }
+ }
+ } elsif ($line=~/^Subject: \[[^\]]*\] (.*)/) {
+ $shorttext = CHECK_NEXT_SHORTTEXT;
+ $subjectline = $line;
+ $sublinenr = "#$linenr & ";
+# Check for Subject line less than line limit
+ if (length($1) > SHORTTEXT_LIMIT) {
+ WARN("summary line over " .
+ SHORTTEXT_LIMIT .
+ " characters\n" . $herecurr);
+ }
+ } elsif ($line=~/^ (.*)/) {
+ $shorttext = IN_SHORTTEXT;
+ $shorttext_exspc = 4;
+ if (length($1) > SHORTTEXT_LIMIT) {
+ WARN("summary line over " .
+ SHORTTEXT_LIMIT .
+ " characters\n" . $herecurr);
+ }
+ }
+ }
+
$cnt_lines++ if ($realcnt != 0);
# Check for incorrect file permissions
@@ -1377,6 +1482,14 @@
WARN("space required after Signed-off-by:\n" .
$herecurr);
}
+ if ($line =~ /^\s*signed-off-by:.*(quicinc|qualcomm)\.com/i) {
+ WARN("invalid Signed-off-by identity\n" . $line );
+ }
+ }
+
+#check the patch for invalid author credentials
+ if ($line =~ /^From:.*(quicinc|qualcomm)\.com/) {
+ WARN("invalid author identity\n" . $line );
}
# Check for wrappage within a valid hunk of the file
@@ -1425,37 +1538,6 @@
$rpt_cleaners = 1;
}
-# check for Kconfig help text having a real description
-# Only applies when adding the entry originally, after that we do not have
-# sufficient context to determine whether it is indeed long enough.
- if ($realfile =~ /Kconfig/ &&
- $line =~ /\+\s*(?:---)?help(?:---)?$/) {
- my $length = 0;
- my $cnt = $realcnt;
- my $ln = $linenr + 1;
- my $f;
- my $is_end = 0;
- while ($cnt > 0 && defined $lines[$ln - 1]) {
- $f = $lines[$ln - 1];
- $cnt-- if ($lines[$ln - 1] !~ /^-/);
- $is_end = $lines[$ln - 1] =~ /^\+/;
- $ln++;
-
- next if ($f =~ /^-/);
- $f =~ s/^.//;
- $f =~ s/#.*//;
- $f =~ s/^\s+//;
- next if ($f =~ /^$/);
- if ($f =~ /^\s*config\s/) {
- $is_end = 1;
- last;
- }
- $length++;
- }
- WARN("please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($is_end && $length < 4);
- #print "is_end<$is_end> length<$length>\n";
- }
-
# check we are in a valid source file if not then ignore this hunk
next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
@@ -1464,6 +1546,7 @@
$rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
!($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:|,|\)\s*;)\s*$/ ||
$line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
+ $realfile ne "scripts/checkpatch.pl" &&
$length > 80)
{
WARN("line over 80 characters\n" . $herecurr);
@@ -2245,7 +2328,7 @@
# check spacing on parentheses
if ($line =~ /\(\s/ && $line !~ /\(\s*(?:\\)?$/ &&
- $line !~ /for\s*\(\s+;/) {
+ $line !~ /for\s*\(\s+;/ && $line !~ /^\+\s*[A-Z_][A-Z\d_]*\(\s*\d+(\,.*)?\)\,?$/) {
ERROR("space prohibited after that open parenthesis '('\n" . $herecurr);
}
if ($line =~ /(\s+)\)/ && $line !~ /^.\s*\)/ &&
@@ -2439,7 +2522,7 @@
if ($realfile !~ m@/vmlinux.lds.h$@ &&
$line =~ /^.\s*\#\s*define\s*$Ident(\()?/) {
my $ln = $linenr;
- my $cnt = $realcnt;
+ my $cnt = $realcnt - 1;
my ($off, $dstat, $dcond, $rest);
my $ctx = '';
@@ -2495,12 +2578,19 @@
{
}
+ # Extremely long macros may fall off the end of the
+ # available context without closing. Give a dangling
+ # backslash the benefit of the doubt and allow it
+ # to gobble any hanging open-parens.
+ $dstat =~ s/\(.+\\$/1/;
+
my $exceptions = qr{
$Declare|
module_param_named|
MODULE_PARAM_DESC|
DECLARE_PER_CPU|
DEFINE_PER_CPU|
+ CLK_[A-Z\d_]+|
__typeof__\(|
union|
struct|
@@ -2659,10 +2749,70 @@
WARN("Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
}
+# sys_open/read/write/close are not allowed in the kernel
+ if ($line =~ /\b(sys_(?:open|read|write|close))\b/) {
+ ERROR("$1 is inappropriate in kernel code.\n" .
+ $herecurr);
+ }
+
+# filp_open is a backdoor for sys_open
+ if ($line =~ /\b(filp_open)\b/) {
+ ERROR("$1 is inappropriate in kernel code.\n" .
+ $herecurr);
+ }
+
+# read[bwl] & write[bwl] use too many barriers, use the _relaxed variants
+ if ($line =~ /\b((?:read|write)[bwl])\b/) {
+ ERROR("Use of $1 is deprecated: use $1_relaxed\n\t" .
+ "with appropriate memory barriers instead.\n" .
+ $herecurr);
+ }
+
+# likewise, in/out[bwl] should be __raw_read/write[bwl]...
+ if ($line =~ /\b((in|out)([bwl]))\b/) {
+ my ($all, $pref, $suf) = ($1, $2, $3);
+ $pref =~ s/in/read/;
+ $pref =~ s/out/write/;
+ ERROR("Use of $all is deprecated: use " .
+ "__raw_$pref$suf\n\t" .
+ "with appropriate memory barriers instead.\n" .
+ $herecurr);
+ }
+
+# dsb is too ARMish, and should usually be mb.
+ if ($line =~ /\bdsb\b/) {
+ WARN("Use of dsb is discouranged: prefer mb.\n" .
+ $herecurr);
+ }
+
+# unbounded string functions are overflow risks
+ my %str_fns = (
+ "sprintf" => "snprintf",
+ "strcpy" => "strncpy",
+ "strcat" => "strncat",
+ "strcmp" => "strncmp",
+ "strcasecmp" => "strncasecmp",
+ "strchr" => "strnchr",
+ "strstr" => "strnstr",
+ "strlen" => "strnlen",
+ );
+ foreach my $k (keys %str_fns) {
+ if ($line =~ /\b$k\b/) {
+ ERROR("Use of $k is deprecated: " .
+ "use $str_fns{$k} instead.\n" .
+ $herecurr);
+ }
+ }
+
# warn about #if 0
if ($line =~ /^.\s*\#\s*if\s+0\b/) {
- CHK("if this code is redundant consider removing it\n" .
- $herecurr);
+ WARN("if this code is redundant consider removing it\n"
+ . $herecurr);
+ }
+# warn about #if 1
+ if ($line =~ /^.\s*\#\s*if\s+1\b/) {
+ WARN("if this code is required consider removing"
+ . " #if 1\n" . $herecurr);
}
# check for needless kfree() checks
@@ -2695,6 +2845,11 @@
}
}
+# check the patch for use of mdelay
+ if ($line =~ /\bmdelay\s*\(/) {
+ WARN("use of mdelay() found: msleep() is the preferred API.\n" . $line );
+ }
+
# warn about #ifdefs in C files
# if ($line =~ /^.\s*\#\s*if(|n)def/ && ($realfile =~ /\.c$/)) {
# print "#ifdef in C files should be avoided\n";
@@ -2804,6 +2959,11 @@
WARN("Statements terminations use 1 semicolon\n" . $herecurr);
}
+# check for return codes on error paths
+ if ($line =~ /\breturn\s+-\d+/) {
+ ERROR("illegal return value, please use an error code\n" . $herecurr);
+ }
+
# check for gcc specific __FUNCTION__
if ($line =~ /__FUNCTION__/) {
WARN("__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr);