Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753403AbbDGTzz (ORCPT ); Tue, 7 Apr 2015 15:55:55 -0400 Received: from seldrel01.sonyericsson.com ([212.209.106.2]:13257 "EHLO seldrel01.sonyericsson.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484AbbDGTzy (ORCPT ); Tue, 7 Apr 2015 15:55:54 -0400 Date: Tue, 7 Apr 2015 12:55:49 -0700 From: Bjorn Andersson To: Joe Perches CC: Andrew Morton , Andy Whitcroft , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v2] checkpatch: validate MODULE_LICENSE content Message-ID: <20150407195548.GA19186@sonymobile.com> References: <1428435440-17092-1-git-send-email-bjorn.andersson@sonymobile.com> <1428436083.8406.28.camel@perches.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1428436083.8406.28.camel@perches.com> User-Agent: Mutt/1.5.22 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2610 Lines: 83 On Tue 07 Apr 12:48 PDT 2015, Joe Perches wrote: > On Tue, 2015-04-07 at 12:37 -0700, Bjorn Andersson wrote: > > There is a well defined list of expected values for MODULE_LICENSE so > > warn the user upon usage of unknown values. > > > > Signed-off-by: Bjorn Andersson > > --- > > > > Thanks for the review Joe! > > No charge. > > > "Proprietary" is in the list because this is the full list of "valid" values > > mentioned in include/linux/module.h. So it's the list of licenses valid for > > submission, but rather the list of valid values. > > So the "Proprietary" entry is only for non kernel-tree uses. > I wonder if the kernel checkpatch script should account for that. > The way I read the comment in module.h is that if you're writing a non-free kernel module then you should mark it with "Proprietary". If people doing so are using checkpatch that's great, but it's just included for completeness, not to argue about the concept of proprietary kernel modules. > I've no strong opinion though if Andrew wants to accept this as-is. > Let me know and I'll drop it from the patch. > cheers, Joe > Thanks, Bjorn > > Changes since v1: > > - Fixed nits pointed out by Joe > > - Added comment to clarify the purpose, as well as origin of the values > > > > scripts/checkpatch.pl | 18 ++++++++++++++++++ > > 1 file changed, 18 insertions(+) > > > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > > index 9a8b2bd..ca10d79 100755 > > --- a/scripts/checkpatch.pl > > +++ b/scripts/checkpatch.pl > > @@ -5431,6 +5431,24 @@ sub process { > > } > > } > > } > > + > > +# validate content of MODULE_LICENSE against list from include/linux/module.h > > + if ($line =~ /\bMODULE_LICENSE\s*\(\s*($String)\s*\)/) { > > + my $extracted_string = get_quoted_string($line, $rawline); > > + my $valid_licenses = qr{ > > + GPL| > > + GPL\ v2| > > + GPL\ and\ additional\ rights| > > + Dual\ BSD/GPL| > > + Dual\ MIT/GPL| > > + Dual\ MPL/GPL| > > + Proprietary > > + }x; > > + if ($extracted_string !~ /^"(?:$valid_licenses)"$/x) { > > + WARN("MODULE_LICENSE", > > + "unknown module license " . $extracted_string . "\n" . $herecurr); > > + } > > + } > > } > > > > # If we have no input at all, then there is nothing to report on > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/