From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1183CC43464 for ; Sat, 19 Sep 2020 18:19:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B4F1F21741 for ; Sat, 19 Sep 2020 18:19:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726595AbgISST3 (ORCPT ); Sat, 19 Sep 2020 14:19:29 -0400 Received: from smtprelay0231.hostedemail.com ([216.40.44.231]:38132 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726449AbgISST3 (ORCPT ); Sat, 19 Sep 2020 14:19:29 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay01.hostedemail.com (Postfix) with ESMTP id E9A8B100E7B44; Sat, 19 Sep 2020 18:19:27 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: hook55_5d0121d27135 X-Filterd-Recvd-Size: 3623 Received: from XPS-9350.home (unknown [47.151.133.149]) (Authenticated sender: joe@perches.com) by omf16.hostedemail.com (Postfix) with ESMTPA; Sat, 19 Sep 2020 18:19:26 +0000 (UTC) Message-ID: Subject: Re: [PATCH] checkpatch: extend author Signed-off-by check for split From: header From: Joe Perches To: Lukas Bulwahn Cc: Dwaipayan Ray , linux-kernel-mentees@lists.linuxfoundation.org, apw@canonical.com, linux-kernel@vger.kernel.org Date: Sat, 19 Sep 2020 11:19:25 -0700 In-Reply-To: References: <20200919081225.28624-1-dwaipayanray1@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.36.4-0ubuntu1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 2020-09-19 at 20:12 +0200, Lukas Bulwahn wrote: > > On Sat, 19 Sep 2020, Joe Perches wrote: > > > On Sat, 2020-09-19 at 13:42 +0530, Dwaipayan Ray wrote: > > > Checkpatch did not handle cases where the author From: header > > > was split into two lines. The author string went empty and > > > checkpatch generated a false NO_AUTHOR_SIGN_OFF warning. > > > > It's good to provide an example where the current code > > doesn't work. > > > > Joe, as this is a linux-kernel-mentees patch, we discussed that before > reaching out to you; you can find Dwaipayan's own evaluation here: > > https://lore.kernel.org/linux-kernel-mentees/CABJPP5BOTG0QLFSaRJTb2vAZ_hJf229OAQihHKG4sYd35i_WMw@mail.gmail.com/ > > Dwaipayan, Joe's comment is still valid; it would be good to describe > the reasons why patches might have split lines (as far as see, long > encodings for non-ascii names). > > I will run my own evaluation of checkpatch.pl before and after patch > application on Monday and then check if I can confirm Dwaipayan's results. > > > It likely would be better to do this by searching forward for > > any extension lines after a "^From:' rather than searching > > backwards as there can be any number of extension lines. > > > > Just to sure what you are talking about... > > You mean just to access the next line through the lines array, rather > than using prevheader and trying to decode that one line twice. > > I agree the logic is a bit redundant and complicated at the moment. > > Once prevheader is non-empty, it already clear that author is '' and > prevheader decodes with that match, because that is the only way to > make prevheader non-empty in the first place; at least as far I see it > right now. Yeah, something like this (completely untested): --- scripts/checkpatch.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3e474072aa90..2c710d05b184 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2679,9 +2679,13 @@ sub process { } # Check the patch for a From: - if (decode("MIME-Header", $line) =~ /^From:\s*(.*)/) { + if ($line =~ /^From:\s*(.*)/i) { $author = $1; - $author = encode("utf8", $author) if ($line =~ /=\?utf-8\?/i); + my $curline = $linenr; + while (defined($rawlines[$curline] && $rawlines[$curline++] =~ /^ \s*(.*)/) { + $author .= $1; + } + $author = encode("utf8", $author) if ($author =~ /=\?utf-8\?/i); $author =~ s/"//g; $author = reformat_email($author); }