The patch titled checkpatch: ensure we actually detect if assignments split across lines has been added to the -mm tree. Its filename is checkpatch-ensure-we-actually-detect-if-assignments-split-across-lines.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: checkpatch: ensure we actually detect if assignments split across lines From: Andy Whitcroft <apw@xxxxxxxxxxxxx> When checking for assignments within if conditionals we check the whole of the condition, but the match is performed using a line constrained regular expression. This means we can miss split conditionals or those on the second line. Allow the check to span lines. Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN scripts/checkpatch.pl~checkpatch-ensure-we-actually-detect-if-assignments-split-across-lines scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-ensure-we-actually-detect-if-assignments-split-across-lines +++ a/scripts/checkpatch.pl @@ -2048,7 +2048,7 @@ sub process { $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) { my ($s, $c) = ($stat, $cond); - if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/) { + if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/s) { ERROR("do not use assignment in if condition\n" . $herecurr); } _ Patches currently in -mm which might be from apw@xxxxxxxxxxxxx are linux-next.patch checkpatch-update-copyrights.patch checkpatch-add-warning-for-p0-patches.patch checkpatch-allow-parentheses-on-return-for-comparisons.patch checkpatch-try-to-catch-missing-vmlinux_symbol-in-vmlinuxldsh.patch checkpatch-loosen-spacing-on-typedef-function-checks.patch checkpatch-fix-continuation-detection-when-handling-spacing-on-operators.patch checkpatch-track-ifdef-else-endif-when-tracking-blocks.patch checkpatch-do-not-report-nr_static-as-a-static-declaration.patch checkpatch-ensure-we-actually-detect-if-assignments-split-across-lines.patch checkpatch-struct-file_operations-should-normally-be-const.patch checkpatch-fix-the-perlcritic-errors.patch checkpatch-version-026.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html