linux-kernel - [PATCH V2] checkpatch: Improve MULTISTATEMENT_MACRO_USE_DO

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sun,  9 Apr 2017 10:59:11 -0700
From:   Joe Perches <joe@...ches.com>
To:     Andy Whitcroft <apw@...onical.com>
Cc:     Alfonso Lima <alfonsolimaastor@...il.com>,
        Andreas Mohr <andi@...as.de>, linux-kernel@...r.kernel.org
Subject: [PATCH V2] checkpatch: Improve MULTISTATEMENT_MACRO_USE_DO_WHILE test

The logic currrently misses macros that start with an if statement.

e.g.:    #define foo(bar)   if (bar) baz;

Add a test for macro content that starts with if

Original-patch-by: Alfonso Lima <alfonsolimaastor@...il.com>
Reported-by: Andreas Mohr <andi@...as.de>
Signed-off-by: Joe Perches <joe@...ches.com>
---

V2: V1 was done incorrectly against a much older version of checkpatch
    and so rolled back several improvements.
    I forgot I had used git checkout <commit_id> -- scripts/checkpatch.pl
    and then edited that.

 scripts/checkpatch.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e8d8481b24c8..2468ed01b333 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4849,8 +4849,10 @@ sub process {
 			    $dstat !~ /^\(\{/ &&						# ({...
 			    $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
 			{
-
-				if ($dstat =~ /;/) {
+				if ($dstat =~ /^\s*if\b/) {
+					ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE",
+					      "Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects\n" . "$herectx");
+				elsif ($dstat =~ /;/) {
 					ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE",
 					      "Macros with multiple statements should be enclosed in a do - while loop\n" . "$herectx");
 				} else {
-- 
2.10.0.rc2.1.g053435c