1 files changed, 115 insertions, 29 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e954df2b2077..3d4040322ae1 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -566,6 +566,7 @@ foreach my $entry (@mode_permission_funcs) {
         $mode_perms_search .= '|' if ($mode_perms_search ne "");
         $mode_perms_search .= $entry->[0];
 }
+$mode_perms_search = "(?:${mode_perms_search})";
 
 our $mode_perms_world_writable = qr{
         S_IWUGO         |
@@ -600,6 +601,37 @@ foreach my $entry (keys %mode_permission_string_types) {
         $mode_perms_string_search .= '|' if ($mode_perms_string_search ne "");
         $mode_perms_string_search .= $entry;
 }
+our $single_mode_perms_string_search = "(?:${mode_perms_string_search})";
+our $multi_mode_perms_string_search = qr{
+        ${single_mode_perms_string_search}
+        (?:\s*\|\s*${single_mode_perms_string_search})*
+}x;
+
+sub perms_to_octal {
+        my ($string) = @_;
+
+        return trim($string) if ($string =~ /^\s*0[0-7]{3,3}\s*$/);
+
+        my $val = "";
+        my $oval = "";
+        my $to = 0;
+        my $curpos = 0;
+        my $lastpos = 0;
+        while ($string =~ /\b(($single_mode_perms_string_search)\b(?:\s*\|\s*)?\s*)/g) {
+                $curpos = pos($string);
+                my $match = $2;
+                my $omatch = $1;
+                last if ($lastpos > 0 && ($curpos - length($omatch) != $lastpos));
+                $lastpos = $curpos;
+                $to |= $mode_permission_string_types{$match};
+                $val .= '\s*\|\s*' if ($val ne "");
+                $val .= $match;
+                $oval .= $omatch;
+        }
+        $oval =~ s/^\s*\|\s*//;
+        $oval =~ s/\s*\|\s*$//;
+        return sprintf("%04o", $to);
+}
 
 our $allowed_asm_includes = qr{(?x:
         irq|
@@ -2875,6 +2907,7 @@ sub process {
 #       logging functions like pr_info that end in a string
 #       lines with a single string
 #       #defines that are a single string
+#       lines with an RFC3986 like URL
 #
 # There are 3 different line length message types:
 # LONG_LINE_COMMENT     a comment starts before but extends beyond $max_line_length
@@ -2906,6 +2939,10 @@ sub process {
                                  $line =~ /^\+\s*(?:\w+)?\s*DEFINE_PER_CPU/) {
                                 $msg_type = "";
 
+                        # URL ($rawline is used in case the URL is in a comment)
+                        } elsif ($rawline =~ /^\+.*\b[a-z][\w\.\+\-]*:\/\/\S+/i) {
+                                $msg_type = "";
+
                         # Otherwise set the alternate message types
 
                         # a comment starts before $max_line_length
@@ -2983,7 +3020,7 @@ sub process {
 
 # check indentation starts on a tab stop
                 if ($^V && $^V ge 5.10.0 &&
-                    $sline =~ /^\+\t+( +)(?:$c90_Keywords\b|\{\s*$|\}\s*(?:else\b|while\b|\s*$))/) {
+                    $sline =~ /^\+\t+( +)(?:$c90_Keywords\b|\{\s*$|\}\s*(?:else\b|while\b|\s*$)|$Declare\s*$Ident\s*[;=])/) {
                         my $indent = length($1);
                         if ($indent % 8) {
                                 if (WARN("TABSTOP",
@@ -3882,10 +3919,12 @@ sub process {
 
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
-                if (($line=~/$Type\s*$Ident\(.*\).*\s*{/) and
-                    !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
+                if ($^V && $^V ge 5.10.0 &&
+                    $sline =~ /$Type\s*$Ident\s*$balanced_parens\s*\{/ &&
+                    $sline !~ /\#\s*define\b.*do\s*\{/ &&
+                    $sline !~ /}/) {
                         if (ERROR("OPEN_BRACE",
-                                  "open brace '{' following function declarations go on the next line\n" . $herecurr) &&
+                                  "open brace '{' following function definitions go on the next line\n" . $herecurr) &&
                             $fix) {
                                 fix_delete_line($fixlinenr, $rawline);
                                 my $fixed_line = $rawline;
@@ -4489,7 +4528,9 @@ sub process {
                 }
 
 # check for unnecessary parentheses around comparisons in if uses
-                if ($^V && $^V ge 5.10.0 && defined($stat) &&
+# when !drivers/staging or command-line uses --strict
+                if (($realfile !~ m@^(?:drivers/staging/)@ || $check_orig) &&
+                    $^V && $^V ge 5.10.0 && defined($stat) &&
                     $stat =~ /(^.\s*if\s*($balanced_parens))/) {
                         my $if_stat = $1;
                         my $test = substr($2, 1, -1);
@@ -5307,7 +5348,7 @@ sub process {
                 }
 
 # check for line continuations in quoted strings with odd counts of "
-                if ($rawline =~ /\\$/ && $rawline =~ tr/"/"/ % 2) {
+                if ($rawline =~ /\\$/ && $sline =~ tr/"/"/ % 2) {
                         WARN("LINE_CONTINUATIONS",
                              "Avoid line continuations in quoted strings\n" . $herecurr);
                 }
@@ -6269,8 +6310,69 @@ sub process {
                              "Exporting world writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
                 }
 
+# check for DEVICE_ATTR uses that could be DEVICE_ATTR_<FOO>
+# and whether or not function naming is typical and if
+# DEVICE_ATTR permissions uses are unusual too
+                if ($^V && $^V ge 5.10.0 &&
+                    defined $stat &&
+                    $stat =~ /\bDEVICE_ATTR\s*\(\s*(\w+)\s*,\s*\(?\s*(\s*(?:${multi_mode_perms_string_search}|0[0-7]{3,3})\s*)\s*\)?\s*,\s*(\w+)\s*,\s*(\w+)\s*\)/) {
+                        my $var = $1;
+                        my $perms = $2;
+                        my $show = $3;
+                        my $store = $4;
+                        my $octal_perms = perms_to_octal($perms);
+                        if ($show =~ /^${var}_show$/ &&
+                            $store =~ /^${var}_store$/ &&
+                            $octal_perms eq "0644") {
+                                if (WARN("DEVICE_ATTR_RW",
+                                         "Use DEVICE_ATTR_RW\n" . $herecurr) &&
+                                    $fix) {
+                                        $fixed[$fixlinenr] =~ s/\bDEVICE_ATTR\s*\(\s*$var\s*,\s*\Q$perms\E\s*,\s*$show\s*,\s*$store\s*\)/DEVICE_ATTR_RW(${var})/;
+                                }
+                        } elsif ($show =~ /^${var}_show$/ &&
+                                 $store =~ /^NULL$/ &&
+                                 $octal_perms eq "0444") {
+                                if (WARN("DEVICE_ATTR_RO",
+                                         "Use DEVICE_ATTR_RO\n" . $herecurr) &&
+                                    $fix) {
+                                        $fixed[$fixlinenr] =~ s/\bDEVICE_ATTR\s*\(\s*$var\s*,\s*\Q$perms\E\s*,\s*$show\s*,\s*NULL\s*\)/DEVICE_ATTR_RO(${var})/;
+                                }
+                        } elsif ($show =~ /^NULL$/ &&
+                                 $store =~ /^${var}_store$/ &&
+                                 $octal_perms eq "0200") {
+                                if (WARN("DEVICE_ATTR_WO",
+                                         "Use DEVICE_ATTR_WO\n" . $herecurr) &&
+                                    $fix) {
+                                        $fixed[$fixlinenr] =~ s/\bDEVICE_ATTR\s*\(\s*$var\s*,\s*\Q$perms\E\s*,\s*NULL\s*,\s*$store\s*\)/DEVICE_ATTR_WO(${var})/;
+                                }
+                        } elsif ($octal_perms eq "0644" ||
+                                 $octal_perms eq "0444" ||
+                                 $octal_perms eq "0200") {
+                                my $newshow = "$show";
+                                $newshow = "${var}_show" if ($show ne "NULL" && $show ne "${var}_show");
+                                my $newstore = $store;
+                                $newstore = "${var}_store" if ($store ne "NULL" && $store ne "${var}_store");
+                                my $rename = "";
+                                if ($show ne $newshow) {
+                                        $rename .= " '$show' to '$newshow'";
+                                }
+                                if ($store ne $newstore) {
+                                        $rename .= " '$store' to '$newstore'";
+                                }
+                                WARN("DEVICE_ATTR_FUNCTIONS",
+                                     "Consider renaming function(s)$rename\n" . $herecurr);
+                        } else {
+                                WARN("DEVICE_ATTR_PERMS",
+                                     "DEVICE_ATTR unusual permissions '$perms' used\n" . $herecurr);
+                        }
+                }
+
 # Mode permission misuses where it seems decimal should be octal
 # This uses a shortcut match to avoid unnecessary uses of a slow foreach loop
+# o Ignore module_param*(...) uses with a decimal 0 permission as that has a
+#   specific definition of not visible in sysfs.
+# o Ignore proc_create*(...) uses with a decimal 0 permission as that means
+#   use the default permissions
                 if ($^V && $^V ge 5.10.0 &&
                     defined $stat &&
                     $line =~ /$mode_perms_search/) {
@@ -6294,8 +6396,9 @@ sub process {
                                 if ($stat =~ /$test/) {
                                         my $val = $1;
                                         $val = $6 if ($skip_args ne "");
-                                        if (($val =~ /^$Int$/ && $val !~ /^$Octal$/) ||
-                                            ($val =~ /^$Octal$/ && length($val) ne 4)) {
+                                        if (!($func =~ /^(?:module_param|proc_create)/ && $val eq "0") &&
+                                            (($val =~ /^$Int$/ && $val !~ /^$Octal$/) ||
+                                             ($val =~ /^$Octal$/ && length($val) ne 4))) {
                                                 ERROR("NON_OCTAL_PERMISSIONS",
                                                       "Use 4 digit octal (0777) not decimal permissions\n" . "$here\n" . $stat_real);
                                         }
@@ -6308,30 +6411,13 @@ sub process {
                 }
 
 # check for uses of S_<PERMS> that could be octal for readability
-                if ($line =~ /\b$mode_perms_string_search\b/) {
-                        my $val = "";
-                        my $oval = "";
-                        my $to = 0;
-                        my $curpos = 0;
-                        my $lastpos = 0;
-                        while ($line =~ /\b(($mode_perms_string_search)\b(?:\s*\|\s*)?\s*)/g) {
-                                $curpos = pos($line);
-                                my $match = $2;
-                                my $omatch = $1;
-                                last if ($lastpos > 0 && ($curpos - length($omatch) != $lastpos));
-                                $lastpos = $curpos;
-                                $to |= $mode_permission_string_types{$match};
-                                $val .= '\s*\|\s*' if ($val ne "");
-                                $val .= $match;
-                                $oval .= $omatch;
-                        }
-                        $oval =~ s/^\s*\|\s*//;
-                        $oval =~ s/\s*\|\s*$//;
-                        my $octal = sprintf("%04o", $to);
+                if ($line =~ /\b($multi_mode_perms_string_search)\b/) {
+                        my $oval = $1;
+                        my $octal = perms_to_octal($oval);
                         if (WARN("SYMBOLIC_PERMS",
                                  "Symbolic permissions '$oval' are not preferred. Consider using octal permissions '$octal'.\n" . $herecurr) &&
                             $fix) {
-                                $fixed[$fixlinenr] =~ s/$val/$octal/;
+                                $fixed[$fixlinenr] =~ s/\Q$oval\E/$octal/;
                         }
                 }