X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=88d1346d3a490849816f61af038753fb507859f1;hb=5e53774f898b28715e2672b7d11ca822c65c6ae8;hp=38466e4cca55187111ec244577cd12461dc384ad;hpb=cb6df05acfa32fe06b4f980422fd4b38c3239c0e;p=blhc%2Fblhc.git

diff --git a/bin/blhc b/bin/blhc
index 38466e4..88d1346 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -422,25 +422,30 @@ sub extension_found {
 # MAIN
 
 # Parse command line arguments.
-my $option_help    = 0;
-my $option_version = 0;
-my $option_pie     = 0;
-my $option_bindnow = 0;
-my $option_all     = 0;
-my $option_arch    = undef;
-my $option_buildd  = 0;
-   $option_color   = 0;
+my $option_help        = 0;
+my $option_version     = 0;
+my $option_pie         = 0;
+my $option_bindnow     = 0;
+my @option_ignore_flag = ();
+my @option_ignore_line = ();
+my $option_all         = 0;
+my $option_arch        = undef;
+my $option_buildd      = 0;
+   $option_color       = 0;
 if (not Getopt::Long::GetOptions(
-            'help|h|?' => \$option_help,
-            'version'  => \$option_version,
+            'help|h|?'      => \$option_help,
+            'version'       => \$option_version,
             # Hardening options.
-            'pie'      => \$option_pie,
-            'bindnow'  => \$option_bindnow,
-            'all'      => \$option_all,
+            'pie'           => \$option_pie,
+            'bindnow'       => \$option_bindnow,
+            'all'           => \$option_all,
+            # Ignore.
+            'ignore-flag=s' => \@option_ignore_flag,
+            'ignore-line=s' => \@option_ignore_line,
             # Misc.
-            'color'    => \$option_color,
-            'arch=s'   => \$option_arch,
-            'buildd'   => \$option_buildd,
+            'color'         => \$option_color,
+            'arch=s'        => \$option_arch,
+            'buildd'        => \$option_buildd,
         )
         or scalar @ARGV == 0) {
     require Pod::Usage;
@@ -480,16 +485,36 @@ if ($option_all) {
     $option_bindnow = 1;
 }
 
+# Strip flags which should be ignored.
+if (scalar @option_ignore_flag > 0) {
+    my %ignores = map { $_ => 1 } @option_ignore_flag;
+    foreach my $flags (@flag_refs) {
+        @{$flags} = grep {
+            # Flag found as string.
+            not exists $ignores{$_}
+            # Flag found as string representation of regexp.
+                and (not defined $flag_renames{$_}
+                        or not exists $ignores{$flag_renames{$_}})
+            } @{$flags};
+    }
+}
+
 # Precompile all flag regexps. any_flags_used(), all_flags_used() get a lot
 # faster with this.
 foreach my $flags (@flag_refs_all) {
     @{$flags} = compile_flag_regexp(\%flag_renames, @{$flags});
 }
 
+# Precompile ignore line regexps, also anchor at beginning and end of line.
+foreach my $ignore (@option_ignore_line) {
+    $ignore = qr/^$ignore$/;
+}
+
 # Final exit code.
 my $exit = 0;
 
-FILE: foreach my $file (@ARGV) {
+FILE:
+foreach my $file (@ARGV) {
     print "checking '$file'...\n" if scalar @ARGV > 1;
 
     open my $fh, '<', $file or die "$!: $file";
@@ -726,9 +751,15 @@ FILE: foreach my $file (@ARGV) {
         @ldflags = (@ldflags, @def_ldflags_bindnow);
     }
 
+LINE:
     for (my $i = 0; $i < scalar @input; $i++) {
         my $line = $input[$i];
 
+        # Ignore line if requested.
+        foreach my $ignore (@option_ignore_line) {
+            next LINE if $line =~ /$ignore/;
+        }
+
         my $skip = 0;
         if (is_non_verbose_build($line, $input[$i + 1], \$skip)) {
             if (not $option_buildd) {
@@ -981,6 +1012,23 @@ Don't require Term::ANSIColor.
 
 Use colored (ANSI) output for warning messages.
 
+=item B<--ignore-flag> I<flag>
+
+Don't print an error when the specific flag is missing in a compiler line.
+I<flag> is a string.
+
+Used to prevent false positives. This option can be specified multiple times.
+
+=item B<--ignore-line> I<regex>
+
+Ignore lines matching the given Perl regex. I<regex> is automatically anchored
+at the beginning and end of the line to prevent false negatives.
+
+B<NOTE>: Not the input lines are checked, but the lines which are displayed in
+warnings (which have line continuation resolved).
+
+Used to prevent false positives. This option can be specified multiple times.
+
 =item B<--pie>
 
 Force check for all +pie hardening flags. By default it's auto detected.