| 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
| ||
|
Date: Thu, 8 Sep 2022 17:49:14 +0000
From: Philippe Schenker <philippe.schenker@...adex.com>
To: "corbet@....net" <corbet@....net>,
"niklas.soderlund@...igine.com" <niklas.soderlund@...igine.com>,
"dwaipayanray1@...il.com" <dwaipayanray1@...il.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-doc@...r.kernel.org" <linux-doc@...r.kernel.org>,
"joe@...ches.com" <joe@...ches.com>,
"lukas.bulwahn@...il.com" <lukas.bulwahn@...il.com>,
"apw@...onical.com" <apw@...onical.com>
CC: "sfr@...b.auug.org.au" <sfr@...b.auug.org.au>,
"louis.peens@...igine.com" <louis.peens@...igine.com>,
"simon.horman@...igine.com" <simon.horman@...igine.com>,
"oss-drivers@...igine.com" <oss-drivers@...igine.com>
Subject: Re: [PATCH v4] checkpatch: warn for non-standard fixes tag style
Hi Niklas,
Thanks for adding me to cc. I will also add Stephen, as he also sent
some comments on my submission the exact same problem. I'm supportive of
your code as it has the nice advantage of suggesting the right format of
the tag if it might be wrong. However it seems lot of stuff is slightly
duplicated and lots of lines could be left away simplifying it greatly.
I don't want to hold anything up anyway so I'm fine with it, but will
stillleave some comments of things I think should be improved.
Please see my comments inline.
On Thu, 2022-09-08 at 18:44 +0200, Niklas Söderlund wrote:
> Add a warning for fixes tags that does not fall in line with the
> standards specified by the community.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund@...igine.com>
> Reviewed-by: Simon Horman <simon.horman@...igine.com>
> Reviewed-by: Louis Peens <louis.peens@...igine.com>
> ---
> * Changes since v3
> - Add test that title in tag match title of commit referenced by sha1.
>
> * Changes since v2
> - Change the pattern to match on 'fixes:?' to catch more malformed
> fixes tags.
>
> * Changes since v1
> - Update the documentation wording and add mention one cause of the
> message can be that email program splits the tag over multiple
> lines.
> ---
> Documentation/dev-tools/checkpatch.rst | 8 +++++
> scripts/checkpatch.pl | 41
> ++++++++++++++++++++++++++
> 2 files changed, 49 insertions(+)
>
> diff --git a/Documentation/dev-tools/checkpatch.rst
> b/Documentation/dev-tools/checkpatch.rst
> index b52452bc2963..8c8456a3bd18 100644
> --- a/Documentation/dev-tools/checkpatch.rst
> +++ b/Documentation/dev-tools/checkpatch.rst
> @@ -612,6 +612,14 @@ Commit message
>
> See:
> https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-your-changes
>
> + **BAD_FIXES_TAG**
> + The Fixes: tag is malformed or does not fall in line with the
> standards
> + specified by the community. This can occur if the tag have been
> split into
> + multiple lines (e.g., when pasted in email program with word
> wrapping
> + enabled).
> +
> + See:
> https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-your-changes
> +
>
> Comparison style
> ----------------
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 79e759aac543..ac7ae2e4a1d8 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -3140,6 +3140,47 @@ sub process {
> }
> }
>
> +# Check Fixes: styles is correct
> + if (!$in_header_lines && $line =~ /^fixes:?/i) {
I would check all lines that start with fixes, even if there is
whitespace in front (and then failing later on...)
if (!$in_header_lines && $line =~ /^\s*fixes:?/i) {
> + my $orig_commit = "";
> + my $id = "0123456789ab";
> + my $title = "commit title";
> + my $tag_case = 1;
> + my $tag_space = 1;
> + my $id_length = 1;
> + my $id_case = 1;
> + my $title_has_quotes = 0;
> +
> + if ($line =~ /(fixes:?)\s+([0-9a-
> f]{5,})\s+($balanced_parens)/i) {
If we check also the fixes: lines that begin with whitespace this would
be a good space to check that we do not want any whitespace in front of
Fixes: tag.
/(\s*fixes:?)\s+([0-9a-f]{5,})\s+($balanced_parens)/i) {
> + my $tag = $1;
> + $orig_commit = $2;
> + $title = $3;
> +
> + $tag_case = 0 if $tag eq "Fixes:";
> + $tag_space = 0 if ($line =~ /^fixes:?
> [0-9a-f]{5,} ($balanced_parens)/i);
> +
> + $id_length = 0 if ($orig_commit =~
> /^[0-9a-f]{12}$/i);
I suggest we borrow the patter that is also used in "Check for git id
commit length and improperly formed commit descriptions". This has the
reason as checking strictly for 12 chars is at the moment right but as
linux grows 13 chars will eventually come.
$id_length = 0 if ($orig_commit =~ /^[0-9a-f]{12,40}$/i);
> + $id_case = 0 if ($orig_commit !~ /[A-
> F]/);
> +
> + # Always strip leading/trailing parens
> then double quotes if existing
> + $title = substr($title, 1, -1);
> + if ($title =~ /^".*"$/) {
> + $title = substr($title, 1, -
> 1);
> + $title_has_quotes = 1;
> + }
> + }
> +
> + my ($cid, $ctitle) =
> git_commit_info($orig_commit, $id,
> + $title);
> +
> + if ($ctitle ne $title || $tag_case ||
> $tag_space ||
> + $id_length || $id_case ||
> !$title_has_quotes) {
> + WARN("BAD_FIXES_TAG",
> + "Please use correct Fixes: style
> 'Fixes: <12 chars of sha1> (\"<title line>\")' - ie: 'Fixes: $cid
> (\"$ctitle\")'\n" . $herecurr);
> +
> + }
> + }
> +
> # Check email subject for common tools that don't need to be
> mentioned
> if ($in_header_lines &&
> $line =~
> /^Subject:.*\b(?:checkpatch|sparse|smatch)\b[^:]/i) {
Powered by blists - more mailing lists