From patchwork Wed Nov 8 03:37:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tobin C. Harding" X-Patchwork-Id: 835574 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tobin.cc header.i=@tobin.cc header.b="M5AEyt0F"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="S5kDuHJc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWsVh5T5gz9s4s for ; Wed, 8 Nov 2017 14:39:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754241AbdKHDh5 (ORCPT ); Tue, 7 Nov 2017 22:37:57 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58693 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754214AbdKHDhv (ORCPT ); Tue, 7 Nov 2017 22:37:51 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2F0DD20EC4; Tue, 7 Nov 2017 22:37:51 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 07 Nov 2017 22:37:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobin.cc; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=UcHiLZWr2plgieR9P aB9lh0Gyq+kmFtxSyMT2wkC6l4=; b=M5AEyt0FwZBcPX4CBFpXb4a7huBVn5ReD 4/FgDLDaLlLyu8shMuCEU+uYisn7je+y6qYoTcmLTbHW+MjybpQnkIUvkTGlq6Pr l6rQLYKFYrOE4uEPYfLe9gsZKfdw1DLTkuRZYjmhoJ/ueUo2GR6dnkwunu1o2CKw eQMofME+oxUVZD8z+Xoic+BTdiXFvruQdQ15L3NnXmRe1eGK0o18gXPkrWcGQbuQ gKQ+qk3K8vhBK6ZtWJxaG6J/DJ82Jv10bTPzdWO2xDdz8YAm+gxS1O65AQ8mncbu xfxHzq5fRveY7dWp1bEIesR6UQ1hN4/pf1Mb4zVAsjG6xmBlL2njw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=UcHiLZWr2plgieR9PaB9lh0Gyq+kmFtxSyMT2wkC6l4=; b=S5kDuHJc f+v5VMSSaqagPOFK8roBrXhBNKZbZWPb5ca52XN9TxU1fMs5sB9pCbM0K2rt2Uil CyI63OxFjM5gr9Cvyi4GJ0pzXcF32qR6SrpuT35Kai0d5zvt/Kmex4E5B9qeYPBt 3Jpul1t7EoniR0OoRlGxf89mkMMURNuBNxE2F9yRrlb8OqPfkpziEGiMSM1rcVja 0Gq/z+iCDSEBDW7oaPNET1CxQzJT8G7PyU+OnSK96X0G0RM8jpuXaOSJDaqAKg84 xZw1ykjgptCjn2vMMu4J0Csw95GXZtWQH6Kz/WawEtMgDDfOhTKqb4A61KM2oEJJ wD7sa/jGwgBc+g== X-ME-Sender: Received: from localhost (124-170-203-151.dyn.iinet.net.au [124.170.203.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 3BA457F91E; Tue, 7 Nov 2017 22:37:50 -0500 (EST) From: "Tobin C. Harding" To: Linus Torvalds Cc: "Tobin C. Harding" , "Jason A. Donenfeld" , Theodore Ts'o , Kees Cook , Paolo Bonzini , Tycho Andersen , "Roberts, William C" , Tejun Heo , Jordan Glover , Greg KH , Petr Mladek , Joe Perches , Ian Campbell , Sergey Senozhatsky , Catalin Marinas , Will Deacon , Steven Rostedt , Chris Fries , Dave Weinstein , Daniel Micay , Djalal Harouni , linux-kernel@vger.kernel.org, Network Development , David Miller , kernel-hardening@lists.openwall.com, "Paul E. McKenney" , Andy Lutomirski , Peter Zijlstra Subject: [PATCH 1/7] scripts/leaking_addresses: use tabs not spaces Date: Wed, 8 Nov 2017 14:37:33 +1100 Message-Id: <1510112259-11572-2-git-send-email-me@tobin.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510112259-11572-1-git-send-email-me@tobin.cc> References: <1510112259-11572-1-git-send-email-me@tobin.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Current code uses spaces instead of tabs in places. Use tabs instead of spaces. Signed-off-by: Tobin C. Harding --- scripts/leaking_addresses.pl | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index 2977371b2956..b64efcecbb5e 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -170,46 +170,46 @@ sub push_to_global sub is_false_positive { - my ($match) = @_; + my ($match) = @_; + + if ($match =~ '\b(0x)?(f|F){16}\b' or + $match =~ '\b(0x)?0{16}\b') { + return 1; + } - if ($match =~ '\b(0x)?(f|F){16}\b' or - $match =~ '\b(0x)?0{16}\b') { - return 1; - } - # vsyscall memory region, we should probably check against a range here. - if ($match =~ '\bf{10}600000\b' or - $match =~ '\bf{10}601000\b') { - return 1; - } + if ($match =~ '\bf{10}600000\b' or# vsyscall memory region, we should probably check against a range here. + $match =~ '\bf{10}601000\b') { + return 1; + } - return 0; + return 0; } # True if argument potentially contains a kernel address. sub may_leak_address { - my ($line) = @_; - my $address = '\b(0x)?ffff[[:xdigit:]]{12}\b'; + my ($line) = @_; + my $address = '\b(0x)?ffff[[:xdigit:]]{12}\b'; - # Signal masks. - if ($line =~ '^SigBlk:' or - $line =~ '^SigCgt:') { - return 0; - } + # Signal masks. + if ($line =~ '^SigBlk:' or + $line =~ '^SigCgt:') { + return 0; + } - if ($line =~ '\bKEY=[[:xdigit:]]{14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b' or - $line =~ '\b[[:xdigit:]]{14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b') { + if ($line =~ '\bKEY=[[:xdigit:]]{14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b' or + $line =~ '\b[[:xdigit:]]{14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b') { return 0; - } + } - while (/($address)/g) { - if (!is_false_positive($1)) { - return 1; - } - } + while (/($address)/g) { + if (!is_false_positive($1)) { + return 1; + } + } - return 0; + return 0; } sub parse_dmesg From patchwork Wed Nov 8 03:37:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tobin C. Harding" X-Patchwork-Id: 835575 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tobin.cc header.i=@tobin.cc header.b="EDaDMNr/"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="MBxwPwR5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWsWF3rk0z9s4s for ; Wed, 8 Nov 2017 14:40:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754724AbdKHDjt (ORCPT ); Tue, 7 Nov 2017 22:39:49 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:43643 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751714AbdKHDhz (ORCPT ); Tue, 7 Nov 2017 22:37:55 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id AF9FA20F29; Tue, 7 Nov 2017 22:37:54 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 07 Nov 2017 22:37:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobin.cc; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=ejwhCN7GAnzDKaH3L JEcaTS37NbH/JxB/xYxHSdbp6c=; b=EDaDMNr/H7BHW7f3n/VAkvyRT9RqieNxo Ocw8eggeERR7o2FTGFnDC7hwN3XlsNSV8uAXFuIswU5hz5pPCp/rbCHoEg1nxNOE O5EmWcDdhQ905C5VIbC6kt23UXivnK6IdhFGnNbvZY9jWdra3Ad4/j9njdfe/LNh EjIraMO6+EG4deHEtxb4QDr5b7g+LXnXKahqxVTJwNqrfX1ggrHl5qGqxID/dxTb A76V/Gn00WORp4AgVQM3/VR48XLUb3hXf2+1bVNNvEot8UxOFS1wFJIsYfBocIAK ilnf4xQ0+AAtWMwPVwFaLoSPVnEEVkvam9PrYUhvZ6rWgRJAO785A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=ejwhCN7GAnzDKaH3LJEcaTS37NbH/JxB/xYxHSdbp6c=; b=MBxwPwR5 BxcVGepL3xzAo+aUONzNScG1mLw/hFP58vkhOl5Dm+2EWB/nZ0y9LKwfnqC06WlM odmZqkoXoy2zHkYmnASfiVpAySo2uBscCiMZk469KJn9q2UmWIS+wZsAP/VYgvUT 1WKxI3EfBfpVt1pMDhLf0vk+PKOPa8YjeeraoXjs6z7jHRlEGLcaHYeleLqSWIWt J5k75uU+viQ+svUkFmX7lUK/O3QSJCDPJDjJNTqrRNVg9Z5kW1HOYPvLSLt4QM4w IAteCyo4PIlHA0DlFX2AebMJtMt821lGtJw6AzK8xSiifgyJ0zwsQUZ121SLIxUL dgJ8BoTw5BmQpg== X-ME-Sender: Received: from localhost (124-170-203-151.dyn.iinet.net.au [124.170.203.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 8E4CF7E7AD; Tue, 7 Nov 2017 22:37:53 -0500 (EST) From: "Tobin C. Harding" To: Linus Torvalds Cc: "Tobin C. Harding" , "Jason A. Donenfeld" , Theodore Ts'o , Kees Cook , Paolo Bonzini , Tycho Andersen , "Roberts, William C" , Tejun Heo , Jordan Glover , Greg KH , Petr Mladek , Joe Perches , Ian Campbell , Sergey Senozhatsky , Catalin Marinas , Will Deacon , Steven Rostedt , Chris Fries , Dave Weinstein , Daniel Micay , Djalal Harouni , linux-kernel@vger.kernel.org, Network Development , David Miller , kernel-hardening@lists.openwall.com, "Paul E. McKenney" , Andy Lutomirski , Peter Zijlstra Subject: [PATCH 2/7] scripts/leaking_addresses: remove dead code Date: Wed, 8 Nov 2017 14:37:34 +1100 Message-Id: <1510112259-11572-3-git-send-email-me@tobin.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510112259-11572-1-git-send-email-me@tobin.cc> References: <1510112259-11572-1-git-send-email-me@tobin.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org debug_arrays is not called. Also, %seen hash is not used. We should remove unused code. Remove dead code. Signed-off-by: Tobin C. Harding --- scripts/leaking_addresses.pl | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index b64efcecbb5e..94b22d5b9237 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -133,14 +133,6 @@ walk(@DIRS); exit 0; -sub debug_arrays -{ - print 'dirs_any: ' . join(", ", @skip_walk_dirs_any) . "\n"; - print 'dirs_abs: ' . join(", ", @skip_walk_dirs_abs) . "\n"; - print 'parse_any: ' . join(", ", @skip_parse_files_any) . "\n"; - print 'parse_abs: ' . join(", ", @skip_parse_files_abs) . "\n"; -} - sub dprint { printf(STDERR @_) if $debug; @@ -281,7 +273,6 @@ sub skip_walk sub walk { my @dirs = @_; - my %seen; while (my $pwd = shift @dirs) { next if (skip_walk($pwd)); From patchwork Wed Nov 8 03:37:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tobin C. Harding" X-Patchwork-Id: 835573 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tobin.cc header.i=@tobin.cc header.b="Af8oR0Hn"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="jOUs7HsU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWsVS1t6cz9s4s for ; Wed, 8 Nov 2017 14:39:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754342AbdKHDiC (ORCPT ); Tue, 7 Nov 2017 22:38:02 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:59339 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754214AbdKHDh6 (ORCPT ); Tue, 7 Nov 2017 22:37:58 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E1E3B20A52; Tue, 7 Nov 2017 22:37:57 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 07 Nov 2017 22:37:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobin.cc; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=fu+eN1vMjU+H4jbFA tHrhAXXBPC4nRpSYUtJPmE3CRs=; b=Af8oR0HnJUG6uqckrtKSxG3Mt9i9TkTbi bvGVirH3PB4wcZg6BUXFLkNoekWqvFqBZsteHU5alpckrKcy389Iny6cXogLpRFC 1THXuKXXL24VIL0CeWBALqlsg/rKSBNuoiiXJQK610pG1kColLAiMf/qbgQoRk6K O4tmts4nXMmpBGlRwQe7VM+KQQ6sUAV8HNvZoviXlTzj2SPivKzL+biYYAwotOJr 9MX/FlG3qnoth/vFCw3HyIgoKmAjrSkGZ8Bqbhlh68V+eW0uPf/BKegvHUGLt9Ka wFH6XzKCI0mrwHDEK9js8D3jNst66woo+TXzE7lZxzxMaWBNLNnLA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=fu+eN1vMjU+H4jbFAtHrhAXXBPC4nRpSYUtJPmE3CRs=; b=jOUs7HsU D5jo5caaBrlxdAo7u/p3w4LA4jmtc4I9Q7NtenpZYQeaIyxGDN9K4XWbmE+n09lf DC9BnsWn2J7Tdwzm61w/erw3l7vGoV7Z27tJcbVgha/VWy8JjANmmEW5O+X5vTaC 14cKkDDV77c0eqiciVr6WyL6MiWj834tOUIY61i6YeCwemz9N8dNIHhgBfuTT6w7 dfC2wLB+VZUYgPuQp7hBvmyXm48A8f0wAVelm5HK5axKOiffUnfSfyRqlIMcJaLs W2beEg0yrx6M8l5thpUpESc38rZyhZEMwcZWQGYPLCOCalBUguyeknXBX8MGZB4z eYjEK0T3hKi7Qw== X-ME-Sender: Received: from localhost (124-170-203-151.dyn.iinet.net.au [124.170.203.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 052AF7FAB2; Tue, 7 Nov 2017 22:37:57 -0500 (EST) From: "Tobin C. Harding" To: Linus Torvalds Cc: "Tobin C. Harding" , "Jason A. Donenfeld" , Theodore Ts'o , Kees Cook , Paolo Bonzini , Tycho Andersen , "Roberts, William C" , Tejun Heo , Jordan Glover , Greg KH , Petr Mladek , Joe Perches , Ian Campbell , Sergey Senozhatsky , Catalin Marinas , Will Deacon , Steven Rostedt , Chris Fries , Dave Weinstein , Daniel Micay , Djalal Harouni , linux-kernel@vger.kernel.org, Network Development , David Miller , kernel-hardening@lists.openwall.com, "Paul E. McKenney" , Andy Lutomirski , Peter Zijlstra Subject: [PATCH 3/7] scripts/leaking_addresses: remove command line options Date: Wed, 8 Nov 2017 14:37:35 +1100 Message-Id: <1510112259-11572-4-git-send-email-me@tobin.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510112259-11572-1-git-send-email-me@tobin.cc> References: <1510112259-11572-1-git-send-email-me@tobin.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently script accepts files to skip. This was added to make running the script faster (for repeat runs). We can remove this functionality in preparation for adding sub commands (scan and format) to the script. Remove command line options. Signed-off-by: Tobin C. Harding --- scripts/leaking_addresses.pl | 58 -------------------------------------------- 1 file changed, 58 deletions(-) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index 94b22d5b9237..719ed0aaede7 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -7,25 +7,6 @@ # - Scans dmesg output. # - Walks directory tree and parses each file (for each directory in @DIRS). # -# You can configure the behaviour of the script; -# -# - By adding paths, for directories you do not want to walk; -# absolute paths: @skip_walk_dirs_abs -# directory names: @skip_walk_dirs_any -# -# - By adding paths, for files you do not want to parse; -# absolute paths: @skip_parse_files_abs -# file names: @skip_parse_files_any -# -# The use of @skip_xxx_xxx_any causes files to be skipped where ever they occur. -# For example adding 'fd' to @skip_walk_dirs_any causes the fd/ directory to be -# skipped for all PID sub-directories of /proc -# -# The same thing can be achieved by passing command line options to --dont-walk -# and --dont-parse. If absolute paths are supplied to these options they are -# appended to the @skip_xxx_xxx_abs arrays. If file names are supplied to these -# options, they are appended to the @skip_xxx_xxx_any arrays. -# # Use --debug to output path before parsing, this is useful to find files that # cause the script to choke. # @@ -50,8 +31,6 @@ my @DIRS = ('/proc', '/sys'); # Command line options. my $help = 0; my $debug = 0; -my @dont_walk = (); -my @dont_parse = (); # Do not parse these files (absolute path). my @skip_parse_files_abs = ('/proc/kmsg', @@ -96,20 +75,9 @@ Version: $V Options: - --dont-walk= Don't walk tree starting at . - --dont-parse= Don't parse . -d, --debug Display debugging output. -h, --help, --version Display this help and exit. -If an absolute path is passed to --dont_XXX then this path is skipped. If a -single filename is passed then this file/directory will be skipped when -appearing under any subdirectory. - -Example: - - # Just scan dmesg output. - scripts/leaking_addresses.pl --dont_walk_abs /proc --dont_walk_abs /sys - Scans the running (64 bit) kernel for potential leaking addresses. EOM @@ -117,8 +85,6 @@ EOM } GetOptions( - 'dont-walk=s' => \@dont_walk, - 'dont-parse=s' => \@dont_parse, 'd|debug' => \$debug, 'h|help' => \$help, 'version' => \$help @@ -126,8 +92,6 @@ GetOptions( help(0) if ($help); -push_to_global(); - parse_dmesg(); walk(@DIRS); @@ -138,28 +102,6 @@ sub dprint printf(STDERR @_) if $debug; } -sub push_in_abs_any -{ - my ($in, $abs, $any) = @_; - - foreach my $path (@$in) { - if (File::Spec->file_name_is_absolute($path)) { - push @$abs, $path; - } elsif (index($path,'/') == -1) { - push @$any, $path; - } else { - print 'path error: ' . $path; - } - } -} - -# Push command line options to global arrays. -sub push_to_global -{ - push_in_abs_any(\@dont_walk, \@skip_walk_dirs_abs, \@skip_walk_dirs_any); - push_in_abs_any(\@dont_parse, \@skip_parse_files_abs, \@skip_parse_files_any); -} - sub is_false_positive { my ($match) = @_; From patchwork Wed Nov 8 03:37:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tobin C. Harding" X-Patchwork-Id: 835572 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tobin.cc header.i=@tobin.cc header.b="uVuXk0YP"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="RHbRNqBa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWsV95RHDz9s72 for ; Wed, 8 Nov 2017 14:39:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754660AbdKHDjH (ORCPT ); Tue, 7 Nov 2017 22:39:07 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:40975 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754341AbdKHDiC (ORCPT ); Tue, 7 Nov 2017 22:38:02 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6D77720EFC; Tue, 7 Nov 2017 22:38:01 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 07 Nov 2017 22:38:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobin.cc; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=nSCNo456MQDs0kO9s CxSqZUJC7HKe2b3i+V4lZ9mr9o=; b=uVuXk0YPpOoIVZl5TGAEBMcGeU+2VcWK1 oY/4e4kGXgtbSxz7ZL1AxUItdM+gwseNqAqhCzzWvipG0HbJIDhtT7m4tEsgTyd9 q7ideBONUPk2s2lIkyvw0t2MkbJ63w4r/UqffTwP71Am3RwBXRZOhZ+mqrw75fTx ljGP9Dl2Dqe6JOGhT8NJ7Ma7zdMx55DHAYM+Aqc/3a3VB3pMuQhEfrltHnkNK3sr pVPuGQvN/2goiFYCTxBGdB5RO7FhIHWKQ37oPWltSmTAmhxgpHWm3ozmJ/cWmCzJ VfQhssh/IdBGTF2c7esPOMi0xq4AhEhdrorirpQEcGKNl18AEWY5Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=nSCNo456MQDs0kO9sCxSqZUJC7HKe2b3i+V4lZ9mr9o=; b=RHbRNqBa 3ag7Bhd58SeqIoamlC+2MjrbhnfSfEUIBFjBXxV09MMDWk9AWMqboa5RiJB6jL8S 9rDLV9H1hkLFlqa0EllaVE8Ols2CVubt7E0PEBp94jR5AYs2zAuXoSLVf7nFXxGi b9wQ5EjgI9cxRgVjBvVEpz3vRORfJBCRpGeLW4kBRcf6swP3dkNfdbYlnaFlKFfo yUX7r9uPNypXsHROtLwBcUS2TaFwdhYOCSeX7L+kx2ZnPnXz9iZwqZbIFUbvN/X0 AmcMAJ0QDL+xq8XsyRSaIlCPQIVGZKrQPjtiKU+nB9PFOPssL1OeNZ8Wl3Ewbn0s pxYaZE+q0Ynrag== X-ME-Sender: Received: from localhost (124-170-203-151.dyn.iinet.net.au [124.170.203.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 79CBD24B4C; Tue, 7 Nov 2017 22:38:00 -0500 (EST) From: "Tobin C. Harding" To: Linus Torvalds Cc: "Tobin C. Harding" , "Jason A. Donenfeld" , Theodore Ts'o , Kees Cook , Paolo Bonzini , Tycho Andersen , "Roberts, William C" , Tejun Heo , Jordan Glover , Greg KH , Petr Mladek , Joe Perches , Ian Campbell , Sergey Senozhatsky , Catalin Marinas , Will Deacon , Steven Rostedt , Chris Fries , Dave Weinstein , Daniel Micay , Djalal Harouni , linux-kernel@vger.kernel.org, Network Development , David Miller , kernel-hardening@lists.openwall.com, "Paul E. McKenney" , Andy Lutomirski , Peter Zijlstra Subject: [PATCH 4/7] scripts/leaking_addresses: add reporting Date: Wed, 8 Nov 2017 14:37:36 +1100 Message-Id: <1510112259-11572-5-git-send-email-me@tobin.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510112259-11572-1-git-send-email-me@tobin.cc> References: <1510112259-11572-1-git-send-email-me@tobin.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently script just dumps all results found. Potentially, this risks loosing single results among multiple duplicate results. We need some way of restricting duplicates to assist users of the script. It would also be nice if we got a report instead of raw results. Duplicates can be defined in various ways, instead of trying to find a single perfect solution we can present the user with various options to display the output. Doing so will typically lead to users wanting to view the output multiple times. Currently we scan the kernel each time, this is slow and unnecessary. We can expedite the process by writing the results to file for subsequent viewing. Add sub-commands `scan` and `format`. Display output as a report instead of raw results. Add --raw flag to view raw results. Save results to file. For subsequent calls to `format` parse output file instead of re-scanning. Signed-off-by: Tobin C. Harding --- scripts/leaking_addresses.pl | 201 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 187 insertions(+), 14 deletions(-) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index 719ed0aaede7..4c31e935319b 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -21,14 +21,19 @@ use File::Spec; use Cwd 'abs_path'; use Term::ANSIColor qw(:constants); use Getopt::Long qw(:config no_auto_abbrev); +use File::Spec::Functions 'catfile'; my $P = $0; my $V = '0.01'; -# Directories to scan. +# Directories to scan (we scan `dmesg` also). my @DIRS = ('/proc', '/sys'); # Command line options. +my $output = "scan.out"; +my $suppress_dmesg = 0; +my $squash_by_path = 0; +my $raw = 0; my $help = 0; my $debug = 0; @@ -70,21 +75,34 @@ sub help my ($exitcode) = @_; print << "EOM"; -Usage: $P [OPTIONS] + +Usage: $P COMMAND [OPTIONS] Version: $V +Commands: + + scan Scan the kernel (savesg raw results to file and runs `format`). + format Parse results file and format output. + Options: - -d, --debug Display debugging output. - -h, --help, --version Display this help and exit. + -o, --output= Raw results output file, used for later formatting. + --suppress-dmesg Do not show dmesg results. + --squash-by-path Show one result per unique path. + --raw Show raw results. + -d, --debug Display debugging output. + -h, --help, --version Display this help and exit. Scans the running (64 bit) kernel for potential leaking addresses. - EOM exit($exitcode); } GetOptions( + 'o|output=s' => \$output, + 'suppress-dmesg' => \$suppress_dmesg, + 'squash-by-path' => \$squash_by_path, + 'raw' => \$raw, 'd|debug' => \$debug, 'h|help' => \$help, 'version' => \$help @@ -92,8 +110,21 @@ GetOptions( help(0) if ($help); -parse_dmesg(); -walk(@DIRS); +my ($command) = @ARGV; +if (not defined $command) { + help(128); +} + +if ($command ne 'scan' and $command ne 'format') { + printf "\nUnknown command: %s\n\n", $command; + help(128); +} + +if ($command eq 'scan') { + scan(); +} + +format_output(); exit 0; @@ -102,6 +133,17 @@ sub dprint printf(STDERR @_) if $debug; } +sub scan +{ + open (my $fh, '>', "$output") or die "$0: $output: $!\n"; + select $fh; + + parse_dmesg(); + walk(@DIRS); + + select STDOUT; +} + sub is_false_positive { my ($match) = @_; @@ -120,30 +162,39 @@ sub is_false_positive return 0; } -# True if argument potentially contains a kernel address. sub may_leak_address { my ($line) = @_; + + my @addresses = extract_addresses($line); + return @addresses > 0; +} + +# Return _all_ non false positive addresses from $line. +sub extract_addresses +{ + my ($line) = @_; my $address = '\b(0x)?ffff[[:xdigit:]]{12}\b'; + my (@addresses, @empty); # Signal masks. if ($line =~ '^SigBlk:' or $line =~ '^SigCgt:') { - return 0; + return @empty; } if ($line =~ '\bKEY=[[:xdigit:]]{14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b' or $line =~ '\b[[:xdigit:]]{14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b') { - return 0; + return @empty; } - while (/($address)/g) { + while ($line =~ /($address)/g) { if (!is_false_positive($1)) { - return 1; + push @addresses, $1; } } - return 0; + return @addresses; } sub parse_dmesg @@ -203,7 +254,6 @@ sub parse_file close $fh; } - # True if we should skip walking this directory. sub skip_walk { @@ -236,3 +286,126 @@ sub walk } } } + +sub format_output +{ + if ($raw) { + dump_raw_output(); + return; + } + + my ($total, $dmesg, $paths, $files) = parse_raw_file(); + + printf "\nTotal number of results from scan (incl dmesg): %d\n", $total; + + if (!$suppress_dmesg) { + print_dmesg($dmesg); + } + squash_by($files, 'filename'); + + if ($squash_by_path) { + squash_by($paths, 'path'); + } +} + +sub dump_raw_output +{ + open (my $fh, '<', $output) or die "$0: $output: $!\n"; + while (<$fh>) { + print $_; + } + close $fh; +} + +sub print_dmesg +{ + my ($dmesg) = @_; + + print "\ndmesg output:\n"; + + if (@$dmesg == 0) { + print "\n"; + return; + } + + foreach(@$dmesg) { + my $index = index($_, ': '); + $index += 2; # skid ': ' + print substr($_, $index); + } +} + +sub squash_by +{ + my ($ref, $desc) = @_; + + print "\nResults squashed by $desc (excl dmesg). "; + print "Displaying [ <$desc>], \n"; + + if (keys %$ref == 0) { + print "\n"; + return; + } + + foreach(keys %$ref) { + my $lines = $ref->{$_}; + my $length = @$lines; + printf "[%d %s] %s", $length, $_, @$lines[0]; + } +} + +sub parse_raw_file +{ + my $total = 0; # Total number of lines parsed. + my @dmesg; # dmesg output. + my %files; # Unique filenames containing leaks. + my %paths; # Unique paths containing leaks. + + open (my $fh, '<', $output) or die "$0: $output: $!\n"; + while (my $line = <$fh>) { + $total++; + + if ("dmesg:" eq substr($line, 0, 6)) { + push @dmesg, $line; + next; + } + + cache_path(\%paths, $line); + cache_filename(\%files, $line); + } + + return $total, \@dmesg, \%paths, \%files; +} + +sub cache_path +{ + my ($paths, $line) = @_; + + my $index = index($line, ': '); + my $path = substr($line, 0, $index); + + $index += 2; # skip ': ' + add_to_cache($paths, $path, substr($line, $index)); +} + +sub cache_filename +{ + my ($files, $line) = @_; + + my $index = index($line, ': '); + my $path = substr($line, 0, $index); + my $filename = basename($path); + + $index += 2; # skip ': ' + add_to_cache($files, $filename, substr($line, $index)); +} + +sub add_to_cache +{ + my ($cache, $key, $value) = @_; + + if (!$cache->{$key}) { + $cache->{$key} = (); + } + push @{$cache->{$key}}, $value; +} From patchwork Wed Nov 8 03:37:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tobin C. Harding" X-Patchwork-Id: 835571 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tobin.cc header.i=@tobin.cc header.b="cBblt7Lk"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="NQDkXU+L"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWsTt5bsLz9s4s for ; Wed, 8 Nov 2017 14:38:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754513AbdKHDiJ (ORCPT ); Tue, 7 Nov 2017 22:38:09 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:52839 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754434AbdKHDiF (ORCPT ); Tue, 7 Nov 2017 22:38:05 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0B79A20EC6; Tue, 7 Nov 2017 22:38:04 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 07 Nov 2017 22:38:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobin.cc; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=Q/KLKATYldN8wtVU+ QSN3jSZUTmmmIA3yAyHXGJytLM=; b=cBblt7Lk0kSyg0vvSUxk6jPcf4VFJc/JK CtkGK2ec/N7dLcuA3td9a4nAvMXiZneWHqb9KtiPlpXtl8hcF9lGIeDgIfT17vqL vb/7hj7ticBlv19GSBoAx/vtGkrmuOVLzAAKGCSjjXnbVlG2V0vUrUbcT+FeiDmk Lz8XcY5wjVWfnp51DYlxD2839qlRFwoTdeMVSerHdqlxvkLQMAq1rO+JCCz5E9jT eHXc7mT5cs9mGwhBvo9IrwpSpwaI4SY2BS1MYYAxDqgww7wCLh3H4sdBtDhK6ZND xeQUY8QoX4oftvRp4XeXph5xTwUgi3zHAS32NteFds6k8YQKoAj4w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=Q/KLKATYldN8wtVU+QSN3jSZUTmmmIA3yAyHXGJytLM=; b=NQDkXU+L jVl0TF6QVg7Oe5nynA8UX4UeLIB7REsDs+SfTFVeylsZ04KxEi0s0mNq1qouK4pX 55g/tWYSciv48mSXrkOvqDXuldUTQ5qQDUR2eEDaedlqSRXoX9k1rXKKX+/K15uk /ubuGAzBKVEU0JjSTQB3yIOVvJYVD0HUlURYtZPjiZiY2BUHz2OY5nENpaT7i6VV NyYaeLhLnSbszp7JgMFmrziMGFyJHI0D4GVJCDgltd1bYWNaqwswzL5N+CfscHPq Y/u1d7R7n3ZtGRP9whA9JFXTkuTWS5Xy/kcgzFGwEZzvZ7MVhDw+9H2LnvgKVjGj eRfAP6BS3ddjFw== X-ME-Sender: Received: from localhost (124-170-203-151.dyn.iinet.net.au [124.170.203.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 0CD5D246D8; Tue, 7 Nov 2017 22:38:04 -0500 (EST) From: "Tobin C. Harding" To: Linus Torvalds Cc: "Tobin C. Harding" , "Jason A. Donenfeld" , Theodore Ts'o , Kees Cook , Paolo Bonzini , Tycho Andersen , "Roberts, William C" , Tejun Heo , Jordan Glover , Greg KH , Petr Mladek , Joe Perches , Ian Campbell , Sergey Senozhatsky , Catalin Marinas , Will Deacon , Steven Rostedt , Chris Fries , Dave Weinstein , Daniel Micay , Djalal Harouni , linux-kernel@vger.kernel.org, Network Development , David Miller , kernel-hardening@lists.openwall.com, "Paul E. McKenney" , Andy Lutomirski , Peter Zijlstra Subject: [PATCH 5/7] scripts/leaking_addresses: add emailing results Date: Wed, 8 Nov 2017 14:37:37 +1100 Message-Id: <1510112259-11572-6-git-send-email-me@tobin.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510112259-11572-1-git-send-email-me@tobin.cc> References: <1510112259-11572-1-git-send-email-me@tobin.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Developers may not have the time (or inclination) to investigate script output. This information is, however, useful. If we add functionality to the script to email results for further investigation. Add --send-report flag to email scan results (to Tobin C. Harding). Signed-off-by: Tobin C. Harding --- scripts/leaking_addresses.pl | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) mode change 100755 => 100644 scripts/leaking_addresses.pl diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl old mode 100755 new mode 100644 index 4c31e935319b..e43105662306 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -34,6 +34,7 @@ my $output = "scan.out"; my $suppress_dmesg = 0; my $squash_by_path = 0; my $raw = 0; +my $send_report = 0; my $help = 0; my $debug = 0; @@ -90,6 +91,7 @@ Options: --suppress-dmesg Do not show dmesg results. --squash-by-path Show one result per unique path. --raw Show raw results. + --send-report Submit raw results for someone else to worry about. -d, --debug Display debugging output. -h, --help, --version Display this help and exit. @@ -103,6 +105,7 @@ GetOptions( 'suppress-dmesg' => \$suppress_dmesg, 'squash-by-path' => \$squash_by_path, 'raw' => \$raw, + 'send-report' => \$send_report, 'd|debug' => \$debug, 'h|help' => \$help, 'version' => \$help @@ -124,6 +127,12 @@ if ($command eq 'scan') { scan(); } +if ($send_report) { + send_report(); + print "Raw scan results sent, thank you.\n"; + exit(0); +} + format_output(); exit 0; @@ -144,6 +153,39 @@ sub scan select STDOUT; } +sub send_report +{ + my $subject = 'LEAK REPORT'; + my $email = 'leaks@tobin.cc'; + + my $message = sprintf("kptr_restrict: %s\n", get_kptr_restrict()); + + # Slurp raw results. + $message .= do { + local $/ = undef; + open my $fh, "<", $output + or die "could not open $output: $!"; + <$fh>; + }; + + open my $mailh, '|-', "mail -s '$subject' $email" + or die( "Could not open pipe! $!" ); + + print $mailh $message; + close $mailh; +} + +sub get_kptr_restrict +{ + my $filename = "/proc/sys/kernel/kptr_restrict"; + my @array = do { + open my $fh, "<", $filename + or die "could not open $filename: $!"; + <$fh>; + }; + return $array[0]; +} + sub is_false_positive { my ($match) = @_; From patchwork Wed Nov 8 03:37:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tobin C. Harding" X-Patchwork-Id: 835570 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tobin.cc header.i=@tobin.cc header.b="kB0zqW3A"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="YJDFe+GL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWsTn6zjWz9s4s for ; Wed, 8 Nov 2017 14:38:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754463AbdKHDij (ORCPT ); Tue, 7 Nov 2017 22:38:39 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46555 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754483AbdKHDiJ (ORCPT ); Tue, 7 Nov 2017 22:38:09 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 896A020C8F; Tue, 7 Nov 2017 22:38:08 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 07 Nov 2017 22:38:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobin.cc; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=n91q568tIS8+ju3A2 73Pv6AeYkph7w/ATlrPJVKyhJc=; b=kB0zqW3Ae2Hra37rr90soTWB2ONBQBhEm UxyY6LdVo0VgqPDCPuc4eN7FFaNwnkfw3W+hjPdkwMgyoZ1LDCBq/mzkTaGsnthX jCliNTrZQ8D9HAZi4FBd8JHwgnAoQ6ApNgfTRfHP4rnAICA2Re/avBOtj1tOzDLg eEc3zX8AAfSpB77D7JkpYc1TE6CCMIGMC2PrY9OTnkTRRha9cGScYf90/NsBAWdm YLWp5+7yuMwP5GSQyGItVd+MR69bsVdCXxLFQh4/gcEK+qsf+8ei2CqR9pB+bzqd fmFs8oIpeHbeI7G3fkLpseSq3nsF5t4oyUJCzYkBNppVgBdHgg7NQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=n91q568tIS8+ju3A273Pv6AeYkph7w/ATlrPJVKyhJc=; b=YJDFe+GL DdxWJHHS2gBmk6wEDa3Emr/pDg0PVmFBiSRuIpAsw05sdLCXZ7krX0ojqgE2U1qp Iw/UQkXp/5YdZzic615gF8LNPMnaXcU+nALSATIZ9K8bNSCxU+RQMeYP9wjD2XuI 7B0RHqLo7maKs2BoafDkGVFLD5d2gZZE9k+/jkbOigUtj178AoQdHJU0Qx0/wlVV rgue/6eHr+xFJ/BpiNnkho9VAH5sj7KKLdL9pf3sOSJ5QUWH8oC3CvMCR+4093KZ 72YDORAWCa2uLyX7wnY6SjDm4K1QVt8OUJeGnEO4ooGleCRCwOt05EYTRmWXm6rp Cy7VZsXKFM2mXQ== X-ME-Sender: Received: from localhost (124-170-203-151.dyn.iinet.net.au [124.170.203.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 6395E7FAB2; Tue, 7 Nov 2017 22:38:07 -0500 (EST) From: "Tobin C. Harding" To: Linus Torvalds Cc: "Tobin C. Harding" , "Jason A. Donenfeld" , Theodore Ts'o , Kees Cook , Paolo Bonzini , Tycho Andersen , "Roberts, William C" , Tejun Heo , Jordan Glover , Greg KH , Petr Mladek , Joe Perches , Ian Campbell , Sergey Senozhatsky , Catalin Marinas , Will Deacon , Steven Rostedt , Chris Fries , Dave Weinstein , Daniel Micay , Djalal Harouni , linux-kernel@vger.kernel.org, Network Development , David Miller , kernel-hardening@lists.openwall.com, "Paul E. McKenney" , Andy Lutomirski , Peter Zijlstra Subject: [PATCH 6/7] scripts/leaking_addresses: fix comment typo Date: Wed, 8 Nov 2017 14:37:38 +1100 Message-Id: <1510112259-11572-7-git-send-email-me@tobin.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510112259-11572-1-git-send-email-me@tobin.cc> References: <1510112259-11572-1-git-send-email-me@tobin.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix typo in comment string. Signed-off-by: Tobin C. Harding --- scripts/leaking_addresses.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index e43105662306..0671aac894be 100644 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -46,7 +46,7 @@ my @skip_parse_files_abs = ('/proc/kmsg', '/sys/kernel/debug/tracing/trace_pipe', '/sys/kernel/security/apparmor/revision'); -# Do not parse thes files under any subdirectory. +# Do not parse these files under any subdirectory. my @skip_parse_files_any = ('0', '1', '2', From patchwork Wed Nov 8 03:37:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tobin C. Harding" X-Patchwork-Id: 835569 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tobin.cc header.i=@tobin.cc header.b="fmM0cxX7"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="hMT8U0Hf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWsT63fBZz9s74 for ; Wed, 8 Nov 2017 14:38:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932130AbdKHDiQ (ORCPT ); Tue, 7 Nov 2017 22:38:16 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:55465 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754434AbdKHDiM (ORCPT ); Tue, 7 Nov 2017 22:38:12 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C360B20F78; Tue, 7 Nov 2017 22:38:11 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 07 Nov 2017 22:38:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobin.cc; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=p6B0hOJx3Uw1AxHBX Yi9CcrCgQUgMozm7is8CmxjHxA=; b=fmM0cxX7A2ySXANHfKzbLFGLZj9w5CmQ2 vxUYHwI5nGrDxdyaZNJSWOf+CpUogCKVq0zfM2n/NgWwk+Xc44slhzcbeKHDDm37 EYRjNiAjMnfeB7TbMZ/j0eCWBeby2ZdH6iCwcRJY8iFLRhCybN1JBwOnkVyf4JZe olvpFzS/4Y4jd3+WEulMfWhD/VCOnU9+p5ngIAAiCAOmSRhFAo+TODZa6Es2zoYc 3Hlkn5phEDstJI3LQwCvKwkbAS1J51kk9MuOLilxc53TfCvsIH12qb+umu6STBiS WBB4FeP9aVYmQME/CZ6tK2M2Rq5DNAB1fYb6weYpWhsXqp4b9zZQA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=p6B0hOJx3Uw1AxHBXYi9CcrCgQUgMozm7is8CmxjHxA=; b=hMT8U0Hf dRQMcmMkZ4SpRFz/Sn6fJblZr2I2/fkZo81SJFzcfcEUImizP/vzsriJ5HlZGRk6 P1KMTvTpm1lakxnsG0fe+pRAPq90hijRpYBtfHsjE0dtGBHn7vKAgvM0jL2pnVPt mQh6VQlDvgl3+bq3BF9jQ+gLsKKNENA6x4cQxTpeZ6X5JsMfUoPAcWFUH0k7kf7Q bXp/04Ies2O8blCDLkdHrv8Dt/CkyBVsTyasTecHgoEHXbVidINOVntlz0HZUduv DOm5Qoulo0gtRirBX6ZsDr7zfQKWy7VEMh3+5y5MYK4EifXCXksr7s0g3RuR0yY5 6rMPMirV1iOefg== X-ME-Sender: Received: from localhost (124-170-203-151.dyn.iinet.net.au [124.170.203.151]) by mail.messagingengine.com (Postfix) with ESMTPA id CBD7E2489B; Tue, 7 Nov 2017 22:38:10 -0500 (EST) From: "Tobin C. Harding" To: Linus Torvalds Cc: "Tobin C. Harding" , "Jason A. Donenfeld" , Theodore Ts'o , Kees Cook , Paolo Bonzini , Tycho Andersen , "Roberts, William C" , Tejun Heo , Jordan Glover , Greg KH , Petr Mladek , Joe Perches , Ian Campbell , Sergey Senozhatsky , Catalin Marinas , Will Deacon , Steven Rostedt , Chris Fries , Dave Weinstein , Daniel Micay , Djalal Harouni , linux-kernel@vger.kernel.org, Network Development , David Miller , kernel-hardening@lists.openwall.com, "Paul E. McKenney" , Andy Lutomirski , Peter Zijlstra Subject: [PATCH 7/7] scripts/leaking_addresses: don't parse usbmon Date: Wed, 8 Nov 2017 14:37:39 +1100 Message-Id: <1510112259-11572-8-git-send-email-me@tobin.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510112259-11572-1-git-send-email-me@tobin.cc> References: <1510112259-11572-1-git-send-email-me@tobin.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org file 'usbmon' causes script to hang. Add usbmon to files to skip under any sub directory. Signed-off-by: Tobin C. Harding --- scripts/leaking_addresses.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index 0671aac894be..501a4759137f 100644 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -69,7 +69,8 @@ my @skip_walk_dirs_any = ('self', 'fd', 'stderr', 'stdin', - 'stdout'); + 'stdout', + 'usbmon'); sub help {