Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1455537

[PATCH] checkpatch: Look for symbolic permissions and suggest octal instead

Show all headers | View raw

S_<FOO> uses should be avoided where octal is more intelligible.

Signed-off-by: Joe Perches <joe@perches.com>
---
 scripts/checkpatch.pl | 49 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 1d5b09d..1140940 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -541,6 +541,32 @@ our $mode_perms_world_writable = qr{
 	0[0-7][0-7][2367]
 }x;
 
+our %mode_permission_string_types = (
+	"S_IRWXU" => 0700,
+	"S_IRUSR" => 0400,
+	"S_IWUSR" => 0200,
+	"S_IXUSR" => 0100,
+	"S_IRWXG" => 0070,
+	"S_IRGRP" => 0040,
+	"S_IWGRP" => 0020,
+	"S_IXGRP" => 0010,
+	"S_IRWXO" => 0007,
+	"S_IROTH" => 0004,
+	"S_IWOTH" => 0002,
+	"S_IXOTH" => 0001,
+	"S_IRWXUGO" => 0777,
+	"S_IRUGO" => 0444,
+	"S_IWUGO" => 0222,
+	"S_IXUGO" => 0111,
+);
+
+#Create a search pattern for all these strings to speed up a loop below
+our $mode_perms_string_search = "";
+foreach my $entry (keys %mode_permission_string_types) {
+	$mode_perms_string_search .= '|' if ($mode_perms_string_search ne "");
+	$mode_perms_string_search .= $entry;
+}
+
 our $allowed_asm_includes = qr{(?x:
 	irq|
 	memory|
@@ -5996,20 +6022,31 @@ sub process {
 					$arg_pos--;
 					$skip_args = "(?:\\s*$FuncArg\\s*,\\s*){$arg_pos,$arg_pos}";
 				}
-				my $test = "\\b$func\\s*\\(${skip_args}([\\d]+)\\s*[,\\)]";
+				my $test = "\\b$func\\s*\\(${skip_args}($FuncArg(?:\\|\\s*$FuncArg)*)\\s*[,\\)]";
 				if ($line =~ /$test/) {
 					my $val = $1;
 					$val = $6 if ($skip_args ne "");
-
-					if ($val !~ /^0$/ &&
-					    (($val =~ /^$Int$/ && $val !~ /^$Octal$/) ||
-					     length($val) ne 4)) {
+					if (($val =~ /^$Int$/ && $val !~ /^$Octal$/) ||
+					    ($val =~ /^$Octal$/ && length($val) ne 4)) {
 						ERROR("NON_OCTAL_PERMISSIONS",
 						      "Use 4 digit octal (0777) not decimal permissions\n" . $herecurr);
-					} elsif ($val =~ /^$Octal$/ && (oct($val) & 02)) {
+					}
+					if ($val =~ /^$Octal$/ && (oct($val) & 02)) {
 						ERROR("EXPORTED_WORLD_WRITABLE",
 						      "Exporting writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
 					}
+					if ($val =~ /\b$mode_perms_string_search\b/) {
+						my $to = 0;
+						while ($val =~ /\b($mode_perms_string_search)\b(?:\s*\|\s*)?\s*/g) {
+							$to |=  $mode_permission_string_types{$1};
+						}
+						my $new = sprintf("%04o", $to);
+						if (WARN("SYMBOLIC_PERMS",
+							 "Symbolic permissions are not preferred. Consider using octal permissions $new.\n" . $herecurr) &&
+						    $fix) {
+							$fixed[$fixlinenr] =~ s/\Q$val\E/$new/;
+						}
+					}
 				}
 			}
 		}
-- 
2.8.0.rc4.16.g56331f8

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Please don't replace numeric parameter like 0444 with macro Linus Torvalds <torvalds@linux-foundation.org> - 2016-08-02 23:00 +0200
  Re: Please don't replace numeric parameter like 0444 with macro Rob Landley <rob@landley.net> - 2016-08-03 00:00 +0200
  [PATCH] checkpatch: Look for symbolic permissions and suggest octal instead Joe Perches <joe@perches.com> - 2016-08-03 01:50 +0200
    Re: [PATCH] checkpatch: Look for symbolic permissions and suggest  octal instead Joe Perches <joe@perches.com> - 2016-08-03 02:40 +0200
    Re: [PATCH] checkpatch: Look for symbolic permissions and suggest  octal instead Al Viro <viro@ZenIV.linux.org.uk> - 2016-08-03 04:10 +0200
  Re: Please don't replace numeric parameter like 0444 with macro Al Viro <viro@ZenIV.linux.org.uk> - 2016-08-03 02:50 +0200
    Re: Please don't replace numeric parameter like 0444 with macro Konstantin Khlebnikov <koct9i@gmail.com> - 2016-08-03 10:10 +0200
      Re: Please don't replace numeric parameter like 0444 with macro Richard Weinberger <richard.weinberger@gmail.com> - 2016-08-03 10:40 +0200
  [PATCH] Add file permission mode helpers Ingo Molnar <mingo@kernel.org> - 2016-08-03 10:20 +0200
    Re: [PATCH] Add file permission mode helpers Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-08-03 10:30 +0200
      Re: [PATCH] Add file permission mode helpers Ingo Molnar <mingo@kernel.org> - 2016-08-03 11:00 +0200
        Re: [PATCH] Add file permission mode helpers Willy Tarreau <w@1wt.eu> - 2016-08-03 11:30 +0200
      Re: [PATCH] Add file permission mode helpers Marcel Holtmann <marcel@holtmann.org> - 2016-08-03 12:00 +0200
    Re: [PATCH] Add file permission mode helpers Joe Perches <joe@perches.com> - 2016-08-03 17:50 +0200
    Re: [PATCH] Add file permission mode helpers Pavel Machek <pavel@ucw.cz> - 2016-08-03 19:00 +0200

csiph-web