From: Andrew Morton <akpm@linux-foundation.org>
To: Brian Norris <computersforpeace@gmail.com>
Cc: Andy Whitcroft <apw@canonical.com>, Joe Perches <joe@perches.com>,
linux-kernel@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
SF Markus Elfring <elfring@users.sourceforge.net>,
Jerome Forissier <jerome.forissier@linaro.org>
Subject: Re: [PATCH] checkpatch: fix uninitialized var when run with --no-tree
Date: Tue, 8 Nov 2016 15:10:40 -0800 [thread overview]
Message-ID: <20161108151040.4283451c39240dd32bdd61dc@linux-foundation.org> (raw)
In-Reply-To: <20161029023609.GA48401@google.com>
On Fri, 28 Oct 2016 19:36:09 -0700 Brian Norris <computersforpeace@gmail.com> wrote:
> On Fri, Oct 28, 2016 at 07:26:31PM -0700, Brian Norris wrote:
> > From: Brian Norris <computersforpeace@gmail.com>
> >
> > If checkpatch.pl gets copied out of the tree, --no-tree shouldn't start
> > complaining:
> >
> > Use of uninitialized value $root in concatenation (.) or string at
> > /path/to/checkpatch.pl line 764.
> >
> > Let's just give the safe answer instead -- don't warn about "obsolete"
> > files.
> >
> > Fixes: 85b0ee18bbf8 ("checkpatch: see if modified files are marked obsolete in MAINTAINERS")
> > Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> > ---
> > This is a 4.9-rc1 regression
> >
> > scripts/checkpatch.pl | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> > index a8368d1c4348..c8cd643dbc6f 100755
> > --- a/scripts/checkpatch.pl
> > +++ b/scripts/checkpatch.pl
> > @@ -761,6 +761,8 @@ sub seed_camelcase_file {
> > sub is_maintained_obsolete {
> > my ($filename) = @_;
> >
> > + return 0 if (!$tree);
>
> Actually, I'm torn on this. It looks really odd to check for !$tree
> here, but it's the only supported case where $root shouldn't be defined.
> Maybe (!defined $root) is a better test? (Sorry, I did a double-take on
> this after I sent it.)
>
> Both would be equally correct, but I suppose the latter would be
> clearer. I'll send v2.
I already have the below. Good enough?
From: Jerome Forissier <jerome.forissier@linaro.org>
Subject: checkpatch: don't try to get maintained status when --no-tree is given
Fixes the following warning:
Use of uninitialized value $root in concatenation (.) or string at /path/to/checkpatch.pl line 764.
Link: http://lkml.kernel.org/r/1476719709-16668-1-git-send-email-jerome.forissier@linaro.org
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
scripts/checkpatch.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN scripts/checkpatch.pl~checkpatch-dont-try-to-get-maintained-status-when-no-tree-is-given scripts/checkpatch.pl
--- a/scripts/checkpatch.pl~checkpatch-dont-try-to-get-maintained-status-when-no-tree-is-given
+++ a/scripts/checkpatch.pl
@@ -761,7 +761,7 @@ sub seed_camelcase_file {
sub is_maintained_obsolete {
my ($filename) = @_;
- return 0 if (!(-e "$root/scripts/get_maintainer.pl"));
+ return 0 if (!$tree || !(-e "$root/scripts/get_maintainer.pl"));
my $status = `perl $root/scripts/get_maintainer.pl --status --nom --nol --nogit --nogit-fallback -f $filename 2>&1`;
_
next prev parent reply other threads:[~2016-11-08 23:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-29 2:26 Brian Norris
2016-10-29 2:36 ` Brian Norris
2016-11-08 23:10 ` Andrew Morton [this message]
2016-11-09 0:00 ` Brian Norris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161108151040.4283451c39240dd32bdd61dc@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=apw@canonical.com \
--cc=computersforpeace@gmail.com \
--cc=elfring@users.sourceforge.net \
--cc=jerome.forissier@linaro.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome