Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99b25a7f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1a29e857 9ac060a7

scripts/leaking_addresses.pl

+4 −5
Original line number Diff line number Diff line
@@ -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);

		}

	}