From 95af90589fc9239baedfb30560fb69eff2c669d7 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 20 May 2018 13:00:24 +0200 Subject: [PATCH] Don't treat hexdumps which contain "cc" as compiler lines --- NEWS | 2 ++ bin/blhc | 2 ++ t/logs/false-positives | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/NEWS b/NEWS index 47d3327..4bdb4f3 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,8 @@ Version 0.XX (Debian bug #898332). - Detect overwrite of -fstack-protector options with -fno-stack-protector (same for -fstack-protector-all and -fstack-protector-strong). +- Don't treat hexdumps which contain "cc" as compiler lines; reported by Kurt + Roeckx (Debian bug #899137). Version 0.08 diff --git a/bin/blhc b/bin/blhc index 193297e..dfd42cd 100755 --- a/bin/blhc +++ b/bin/blhc @@ -1074,6 +1074,8 @@ foreach my $file (@ARGV) { next if $line =~ m{^\s*rm\s+}; # Some build systems emit "gcc > file". next if $line =~ m{$cc_regex_normal\s*>\s*\S+}o; + # Hex output may contain "cc". + next if $line =~ m#(?:\b[0-9a-fA-F]{2,}\b\s*){5}#; # Check if additional hardening options were used. Used to ensure # they are used for the complete build. diff --git a/t/logs/false-positives b/t/logs/false-positives index 0a6099d..d21f4f7 100644 --- a/t/logs/false-positives +++ b/t/logs/false-positives @@ -45,3 +45,21 @@ GNU C++ (Debian 4.9.1-17) version 4.9.1 (x86_64-linux-gnu) compiled by GNU C version 4.9.1, GMP version 6.0.0, MPFR version 3.1.2-p3, MPC version 1.0.2 GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072 Compiler executable checksum: 26648cf2c5cb5e5907eedabc7a0be2ce + +# hexdump +0300 - 41 0f ec 2f 28 ea be ac-a1 33 91 ca cc 35 6d 63 A../(....3...5mc +0310 - 57 e9 0a d6 1a 41 1b d2-89 b2 87 ef 9a fb 77 6b W....A........wk +0320 - 80 c3 b8 bc 5d 86 ce b6-2f b0 6c 46 ba 7b 03 cc ....].../.lF.{.. +0330 - 0f 85 8c 0a 6e 16 b8 90-80 29 13 49 00 c1 43 51 ....n....).I..CQ +0340 - b9 59 53 8b 20 1d 0c e2-3d 0d 75 11 77 63 96 0a .YS. ...=.u.wc.. +0350 - 12 82 f0 da b8 82 57 4b-71 6a e1 8d 6e ce cc 69 ......WKqj..n..i +0360 - a0 ab 2b 9c 95 18 77 f2-6c 48 cf 7f fc 28 5f 3e ..+...w.lH...(_> +0370 - 7e 01 4c c7 a5 3a 68 b5-a3 95 ff 5f fb 16 ae 97 ~.L..:h...._.... +0380 - 1d 5a a0 a1 d6 65 cb 0c-63 5e a0 b5 0c 9e 5f de .Z...e..c^...._. +0390 - eb f4 06 ab 35 e2 61 73-ea b8 e5 9e c1 c4 bf 88 ....5.as........ +03a0 - 41 aa 93 84 bd 5a a5 9a-88 d7 86 9a 68 97 d1 f3 A....Z......h... +03b0 - e2 6e 5d a0 cc 46 14 df-74 c8 8b 77 ff c2 1e f5 .n]..F..t..w.... +03c0 - f9 11 0d 38 23 3c 31 6d-1c 7a 2b 28 8f 3c 04 22 ...8#<1m.z+(.<." +03d0 - 6e 57 7b cb f1 2d ec 4a-82 b6 b6 49 be 63 56 1a nW{..-.J...I.cV. +03e0 - 8c 1d af 9a e6 5c 5f 6e-03 f8 8e 9b 0b 30 b6 c0 .....\_n.....0.. +03f0 - 42 b6 a1 d9 b0 59 09 81-74 b1 1f c0 9c 3f c6 f1 B....Y..t....?.. -- 2.45.2