leaking_addresses patches for 5.1-rc1
Here are two super trivial patches to the leaking addresses script for the 5.1-rc1 merge window. One fixes the debugging output which is currently broken in a bunch of places, the other removes the --version command line option. Both patches have been tested and sitting in linux-next tree for a month or so. Signed-off-by: Tobin C. Harding <tobin@kernel.org> -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEc/+jpUAIMPwyplf8QL+eTCadZgcFAlyARccACgkQQL+eTCad ZgfP+RAAx92NbT0q7c/GGDPsywt5mJkuZs6xxUhGXyBBaj5hOyVALYOd57SrK30s xAv4rhnJZOoboKENdec6+w8bz+GM0i/RC2MIvOIK7ex0pS0C67U2fEaYbJO2roYM /DTviyq0fGs0ZLhN3fr2/S1WzXpk84IXxH0HczKnshb1ldRs92K+MUugRjyGcl4l riKoICSDsYqblKTuQdO+ckGEpk+zq1U2OiZyF81wVChlitmrVko4esrEsALxLWxC feojoWvDfZUoIUelRDv8rNgylXlvPHABGtE3x/lY1PMSTq2nDBuDhLQDdADiiPzl 81JGCmJmKE8e4e5iFQjsJND/0bxHReu7GO7FnnpllE6OlsxFiP+/zgSD1oNA32ST pUKddv7QTzthN8khdj74GMhhamNP7YhoU2AQTgw6kYH+9m1D82RSqS304ZVa4tR2 ES6nrf1h51UUXDb3ODOs4RTex5m/KraPaJw0S3/QXAmiLfpwoOYOaZ5tGWObygz5 ECyLcuuGxAa+mzVxmik2IdWcXV6TEyf7AvMus7ygqqwvZ1lfg64ddMTngnXsedkd pf5aswKtoN+X3h1gVMJQYLU+H6nikMdLtd0gbUj9eUNEScrRyvJ9mUmAapE0Go+P oc797G1RsuxvyeLVYNrYT1vYFeUxhMPqyL7UYHfeVnTpvOTzz+Q= =7U0N -----END PGP SIGNATURE----- Merge tag 'leaks-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks Pull leaking_addresses updates from Tobin Harding: "Here are two super trivial patches to the leaking addresses script. One fixes the debugging output which is currently broken in a bunch of places, the other removes the --version command line option. Both patches have been tested and sitting in linux-next tree for a month or so" * tag 'leaks-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks: leaking_addresses: Completely remove --version flag leaking_addresses: Fix calls to dprint
This commit is contained in:
commit
99b25a7fc6
|
@ -97,7 +97,7 @@ Options:
|
|||
--32-bit Scan 32-bit kernel.
|
||||
--page-offset-32-bit=o Page offset (for 32-bit kernel 0xABCD1234).
|
||||
-d, --debug Display debugging output.
|
||||
-h, --help, --version Display this help and exit.
|
||||
-h, --help Display this help and exit.
|
||||
|
||||
Scans the running kernel for potential leaking addresses.
|
||||
|
||||
|
@ -108,7 +108,6 @@ EOM
|
|||
GetOptions(
|
||||
'd|debug' => \$debug,
|
||||
'h|help' => \$help,
|
||||
'version' => \$help,
|
||||
'o|output-raw=s' => \$output_raw,
|
||||
'i|input-raw=s' => \$input_raw,
|
||||
'suppress-dmesg' => \$suppress_dmesg,
|
||||
|
@ -231,7 +230,7 @@ sub get_kernel_config_option
|
|||
my $tmp_file = "/tmp/tmpkconf";
|
||||
|
||||
if (system("gunzip < /proc/config.gz > $tmp_file")) {
|
||||
dprint "$0: system(gunzip < /proc/config.gz) failed\n";
|
||||
dprint("system(gunzip < /proc/config.gz) failed\n");
|
||||
return "";
|
||||
} else {
|
||||
@config_files = ($tmp_file);
|
||||
|
@ -243,7 +242,7 @@ sub get_kernel_config_option
|
|||
}
|
||||
|
||||
foreach my $file (@config_files) {
|
||||
dprint("parsing config file: %s\n", $file);
|
||||
dprint("parsing config file: $file\n");
|
||||
$value = option_from_file($option, $file);
|
||||
if ($value ne "") {
|
||||
last;
|
||||
|
@ -502,7 +501,7 @@ sub walk
|
|||
next;
|
||||
}
|
||||
|
||||
dprint "parsing: $path\n";
|
||||
dprint("parsing: $path\n");
|
||||
timed_parse_file($path);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue