1 files changed, 121 insertions, 26 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index f0bb6d60c07b..d12435992dea 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -278,6 +278,7 @@ our $Attribute	= qr{
                         __noreturn|
                         __used|
                         __cold|
+                        __pure|
                         __noclone|
                         __deprecated|
                         __read_mostly|
@@ -298,6 +299,7 @@ our $Binary	= qr{(?i)0b[01]+$Int_type?};
 our $Hex        = qr{(?i)0x[0-9a-f]+$Int_type?};
 our $Int        = qr{[0-9]+$Int_type?};
 our $Octal      = qr{0[0-7]+$Int_type?};
+our $String     = qr{"[X\t]*"};
 our $Float_hex  = qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?};
 our $Float_dec  = qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?};
 our $Float_int  = qr{(?i)[0-9]+e-?[0-9]+[fl]?};
@@ -337,6 +339,11 @@ our $UTF8	= qr{
         | $NON_ASCII_UTF8
 }x;
 
+our $typeOtherOSTypedefs = qr{(?x:
+        u_(?:char|short|int|long) |          # bsd
+        u(?:nchar|short|int|long)            # sysv
+)};
+
 our $typeTypedefs = qr{(?x:
         (?:__)?(?:u|s|be|le)(?:8|16|32|64)|
         atomic_t
@@ -473,6 +480,7 @@ sub build_types {
                         (?:$Modifier\s+|const\s+)*
                         (?:
                                 (?:typeof|__typeof__)\s*\([^\)]*\)|
+                                (?:$typeOtherOSTypedefs\b)|
                                 (?:$typeTypedefs\b)|
                                 (?:${all}\b)
                         )
@@ -490,6 +498,7 @@ sub build_types {
                         (?:
                                 (?:typeof|__typeof__)\s*\([^\)]*\)|
                                 (?:$typeTypedefs\b)|
+                                (?:$typeOtherOSTypedefs\b)|
                                 (?:${allWithAttr}\b)
                         )
                         (?:\s+$Modifier|\s+const)*
@@ -517,7 +526,7 @@ our $Typecast	= qr{\s*(\(\s*$NonptrType\s*\)){0,1}\s*};
 
 our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;
 our $LvalOrFunc = qr{((?:[\&\*]\s*)?$Lval)\s*($balanced_parens{0,1})\s*};
-our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)};
+our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant|$String)};
 
 our $declaration_macros = qr{(?x:
         (?:$Storage\s+)?(?:[A-Z_][A-Z0-9]*_){0,2}(?:DEFINE|DECLARE)(?:_[A-Z0-9]+){1,2}\s*\(|
@@ -632,6 +641,8 @@ sub git_commit_info {
         $output =~ s/^\s*//gm;
         my @lines = split("\n", $output);
 
+        return ($id, $desc) if ($#lines < 0);
+
         if ($lines[0] =~ /^error: short SHA1 $commit is ambiguous\./) {
 # Maybe one day convert this block of bash into something that returns
 # all matching commit ids, but it's very slow...
@@ -2159,6 +2170,13 @@ sub process {
                         }
                 }
 
+# Check email subject for common tools that don't need to be mentioned
+                if ($in_header_lines &&
+                    $line =~ /^Subject:.*\b(?:checkpatch|sparse|smatch)\b[^:]/i) {
+                        WARN("EMAIL_SUBJECT",
+                             "A patch subject line should describe the change not the tool that found it\n" . $herecurr);
+                }
+
 # Check for old stable address
                 if ($line =~ /^\s*cc:\s*.*<?\bstable\@kernel\.org\b>?.*$/i) {
                         ERROR("STABLE_ADDRESS",
@@ -2171,21 +2189,49 @@ sub process {
                               "Remove Gerrit Change-Id's before submitting upstream.\n" . $herecurr);
                 }
 
-# Check for improperly formed commit descriptions
-                if ($in_commit_log &&
-                    $line =~ /\bcommit\s+[0-9a-f]{5,}/i &&
-                    !($line =~ /\b[Cc]ommit [0-9a-f]{12,40} \("/ ||
-                      ($line =~ /\b[Cc]ommit [0-9a-f]{12,40}\s*$/ &&
-                       defined $rawlines[$linenr] &&
-                       $rawlines[$linenr] =~ /^\s*\("/))) {
-                        $line =~ /\b(c)ommit\s+([0-9a-f]{5,})/i;
+# Check for git id commit length and improperly formed commit descriptions
+                if ($in_commit_log && $line =~ /\b(c)ommit\s+([0-9a-f]{5,})/i) {
                         my $init_char = $1;
                         my $orig_commit = lc($2);
-                        my $id = '01234567890ab';
-                        my $desc = 'commit description';
-                        ($id, $desc) = git_commit_info($orig_commit, $id, $desc);
-                        ERROR("GIT_COMMIT_ID",
-                              "Please use 12 or more chars for the git commit ID like: '${init_char}ommit $id (\"$desc\")'\n" . $herecurr);
+                        my $short = 1;
+                        my $long = 0;
+                        my $case = 1;
+                        my $space = 1;
+                        my $hasdesc = 0;
+                        my $hasparens = 0;
+                        my $id = '0123456789ab';
+                        my $orig_desc = "commit description";
+                        my $description = "";
+
+                        $short = 0 if ($line =~ /\bcommit\s+[0-9a-f]{12,40}/i);
+                        $long = 1 if ($line =~ /\bcommit\s+[0-9a-f]{41,}/i);
+                        $space = 0 if ($line =~ /\bcommit [0-9a-f]/i);
+                        $case = 0 if ($line =~ /\b[Cc]ommit\s+[0-9a-f]{5,40}[^A-F]/);
+                        if ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("([^"]+)"\)/i) {
+                                $orig_desc = $1;
+                                $hasparens = 1;
+                        } elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s*$/i &&
+                                 defined $rawlines[$linenr] &&
+                                 $rawlines[$linenr] =~ /^\s*\("([^"]+)"\)/) {
+                                $orig_desc = $1;
+                                $hasparens = 1;
+                        } elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("[^"]+$/i &&
+                                 defined $rawlines[$linenr] &&
+                                 $rawlines[$linenr] =~ /^\s*[^"]+"\)/) {
+                                $line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("([^"]+)$/i;
+                                $orig_desc = $1;
+                                $rawlines[$linenr] =~ /^\s*([^"]+)"\)/;
+                                $orig_desc .= " " . $1;
+                                $hasparens = 1;
+                        }
+
+                        ($id, $description) = git_commit_info($orig_commit,
+                                                              $id, $orig_desc);
+
+                        if ($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens) {
+                                ERROR("GIT_COMMIT_ID",
+                                      "Please use git commit description style 'commit <12+ chars of sha1> (\"<title line>\")' - ie: '${init_char}ommit $id (\"$description\")'\n" . $herecurr);
+                        }
                 }
 
 # Check for added, moved or deleted files
@@ -2355,6 +2401,13 @@ sub process {
                              "Use of CONFIG_EXPERIMENTAL is deprecated. For alternatives, see https://lkml.org/lkml/2012/10/23/580\n");
                 }
 
+# discourage the use of boolean for type definition attributes of Kconfig options
+                if ($realfile =~ /Kconfig/ &&
+                    $line =~ /^\+\s*\bboolean\b/) {
+                        WARN("CONFIG_TYPE_BOOLEAN",
+                             "Use of boolean is deprecated, please use bool instead.\n" . $herecurr);
+                }
+
                 if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
                     ($line =~ /\+(EXTRA_[A-Z]+FLAGS).*/)) {
                         my $flag = $1;
@@ -2499,7 +2552,7 @@ sub process {
                         }
                 }
 
-                if ($line =~ /^\+.*(\w+\s*)?\(\s*$Type\s*\)[ \t]+(?!$Assignment|$Arithmetic|[,;\({\[\<\>])/ &&
+                if ($line =~ /^\+.*(\w+\s*)?\(\s*$Type\s*\)[ \t]+(?!$Assignment|$Arithmetic|[,;:\?\(\{\}\[\<\>]|&&|\|\||\\$)/ &&
                     (!defined($1) || $1 !~ /sizeof\s*/)) {
                         if (CHK("SPACING",
                                 "No space is necessary after a cast\n" . $herecurr) &&
@@ -3124,6 +3177,7 @@ sub process {
                     $line !~ /\btypedef\s+$Type\s*\(\s*\*?$Ident\s*\)\s*\(/ &&
                     $line !~ /\btypedef\s+$Type\s+$Ident\s*\(/ &&
                     $line !~ /\b$typeTypedefs\b/ &&
+                    $line !~ /\b$typeOtherOSTypedefs\b/ &&
                     $line !~ /\b__bitwise(?:__|)\b/) {
                         WARN("NEW_TYPEDEFS",
                              "do not add new typedefs\n" . $herecurr);
@@ -3200,7 +3254,7 @@ sub process {
 # check for uses of printk_ratelimit
                 if ($line =~ /\bprintk_ratelimit\s*\(/) {
                         WARN("PRINTK_RATELIMITED",
-"Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit\n" . $herecurr);
+                             "Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit\n" . $herecurr);
                 }
 
 # printk should use KERN_* levels.  Note that follow on printk's on the
@@ -3646,7 +3700,22 @@ sub process {
                                          $op eq '*' or $op eq '/' or
                                          $op eq '%')
                                 {
-                                        if ($ctx =~ /Wx[^WCE]|[^WCE]xW/) {
+                                        if ($check) {
+                                                if (defined $fix_elements[$n + 2] && $ctx !~ /[EW]x[EW]/) {
+                                                        if (CHK("SPACING",
+                                                                "spaces preferred around that '$op' $at\n" . $hereptr)) {
+                                                                $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
+                                                                $fix_elements[$n + 2] =~ s/^\s+//;
+                                                                $line_fixed = 1;
+                                                        }
+                                                } elsif (!defined $fix_elements[$n + 2] && $ctx !~ /Wx[OE]/) {
+                                                        if (CHK("SPACING",
+                                                                "space preferred before that '$op' $at\n" . $hereptr)) {
+                                                                $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]);
+                                                                $line_fixed = 1;
+                                                        }
+                                                }
+                                        } elsif ($ctx =~ /Wx[^WCE]|[^WCE]xW/) {
                                                 if (ERROR("SPACING",
                                                           "need consistent spacing around '$op' $at\n" . $hereptr)) {
                                                         $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
@@ -4251,6 +4320,7 @@ sub process {
                         $ctx = $dstat;
 
                         $dstat =~ s/\\\n.//g;
+                        $dstat =~ s/$;/ /g;
 
                         if ($dstat =~ /^\+\s*#\s*define\s+$Ident\s*${balanced_parens}\s*do\s*{(.*)\s*}\s*while\s*\(\s*0\s*\)\s*([;\s]*)\s*$/) {
                                 my $stmts = $2;
@@ -4417,12 +4487,18 @@ sub process {
 
 # check for unnecessary blank lines around braces
                 if (($line =~ /^.\s*}\s*$/ && $prevrawline =~ /^.\s*$/)) {
-                        CHK("BRACES",
-                            "Blank lines aren't necessary before a close brace '}'\n" . $hereprev);
+                        if (CHK("BRACES",
+                                "Blank lines aren't necessary before a close brace '}'\n" . $hereprev) &&
+                            $fix && $prevrawline =~ /^\+/) {
+                                fix_delete_line($fixlinenr - 1, $prevrawline);
+                        }
                 }
                 if (($rawline =~ /^.\s*$/ && $prevline =~ /^..*{\s*$/)) {
-                        CHK("BRACES",
-                            "Blank lines aren't necessary after an open brace '{'\n" . $hereprev);
+                        if (CHK("BRACES",
+                                "Blank lines aren't necessary after an open brace '{'\n" . $hereprev) &&
+                            $fix) {
+                                fix_delete_line($fixlinenr, $rawline);
+                        }
                 }
 
 # no volatiles please
@@ -4545,7 +4621,7 @@ sub process {
                 }
 
 # check for logging functions with KERN_<LEVEL>
-                if ($line !~ /printk\s*\(/ &&
+                if ($line !~ /printk(?:_ratelimited|_once)?\s*\(/ &&
                     $line =~ /\b$logFunctions\s*\(.*\b(KERN_[A-Z]+)\b/) {
                         my $level = $1;
                         if (WARN("UNNECESSARY_KERN_LEVEL",
@@ -4804,7 +4880,8 @@ sub process {
 # check for seq_printf uses that could be seq_puts
                 if ($sline =~ /\bseq_printf\s*\(.*"\s*\)\s*;\s*$/) {
                         my $fmt = get_quoted_string($line, $rawline);
-                        if ($fmt ne "" && $fmt !~ /[^\\]\%/) {
+                        $fmt =~ s/%%//g;
+                        if ($fmt !~ /%/) {
                                 if (WARN("PREFER_SEQ_PUTS",
                                          "Prefer seq_puts to seq_printf\n" . $herecurr) &&
                                     $fix) {
@@ -5089,6 +5166,12 @@ sub process {
                         }
                 }
 
+# check for uses of __DATE__, __TIME__, __TIMESTAMP__
+                while ($line =~ /\b(__(?:DATE|TIME|TIMESTAMP)__)\b/g) {
+                        ERROR("DATE_TIME",
+                              "Use of the '$1' macro makes the build non-deterministic\n" . $herecurr);
+                }
+
 # check for use of yield()
                 if ($line =~ /\byield\s*\(\s*\)/) {
                         WARN("YIELD",
@@ -5140,8 +5223,9 @@ sub process {
                              "please use device_initcall() or more appropriate function instead of __initcall() (see include/linux/init.h)\n" . $herecurr);
                 }
 
-# check for various ops structs, ensure they are const.
-                my $struct_ops = qr{acpi_dock_ops|
+# check for various structs that are normally const (ops, kgdb, device_tree)
+                my $const_structs = qr{
+                                acpi_dock_ops|
                                 address_space_operations|
                                 backlight_ops|
                                 block_device_operations|
@@ -5164,6 +5248,7 @@ sub process {
                                 mtrr_ops|
                                 neigh_ops|
                                 nlmsvc_binding|
+                                of_device_id|
                                 pci_raw_ops|
                                 pipe_buf_operations|
                                 platform_hibernation_ops|
@@ -5179,7 +5264,7 @@ sub process {
                                 usb_mon_operations|
                                 wd_ops}x;
                 if ($line !~ /\bconst\b/ &&
-                    $line =~ /\bstruct\s+($struct_ops)\b/) {
+                    $line =~ /\bstruct\s+($const_structs)\b/) {
                         WARN("CONST_STRUCT",
                              "struct $1 should normally be const\n" .
                                 $herecurr);
@@ -5204,6 +5289,13 @@ sub process {
                               "#define of '$1' is wrong - use Kconfig variables or standard guards instead\n" . $herecurr);
                 }
 
+# likely/unlikely comparisons similar to "(likely(foo) > 0)"
+                if ($^V && $^V ge 5.10.0 &&
+                    $line =~ /\b((?:un)?likely)\s*\(\s*$FuncArg\s*\)\s*$Compare/) {
+                        WARN("LIKELY_MISUSE",
+                             "Using $1 should generally have parentheses around the comparison\n" . $herecurr);
+                }
+
 # whine mightly about in_atomic
                 if ($line =~ /\bin_atomic\s*\(/) {
                         if ($realfile =~ m@^drivers/@) {
@@ -5255,6 +5347,9 @@ sub process {
                                              length($val) ne 4)) {
                                                 ERROR("NON_OCTAL_PERMISSIONS",
                                                       "Use 4 digit octal (0777) not decimal permissions\n" . $herecurr);
+                                        } elsif ($val =~ /^$Octal$/ && (oct($val) & 02)) {
+                                                ERROR("EXPORTED_WORLD_WRITABLE",
+                                                      "Exporting writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
                                         }
                                 }
                         }