linux-kernel - [patch 8/9] tools: bpftool: Cleanup license mess

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
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190117231501.560475279@linutronix.de>
Date:   Fri, 18 Jan 2019 00:14:24 +0100
From:   Thomas Gleixner <tglx@...utronix.de>
To:     LKML <linux-kernel@...r.kernel.org>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Kate Stewart <kstewart@...uxfoundation.org>,
        Jonathan Corbet <corbet@....net>,
        Jakub Kicinski <jakub.kicinski@...ronome.com>,
        Roman Gushchin <guro@...com>,
        YueHaibing <yuehaibing@...wei.com>, Yonghong Song <yhs@...com>,
        Stanislav Fomichev <sdf@...gle.com>,
        Sean Young <sean@...s.org>, Jiri Benc <jbenc@...hat.com>,
        David Calavera <david.calavera@...il.com>,
        Andrey Ignatov <rdna@...com>, Joe Stringer <joe@...d.net.nz>,
        David Ahern <dsahern@...il.com>,
        Alexei Starovoitov <alexei.starovoitov@...il.com>,
        Petar Penkov <ppenkov@...nford.edu>,
        Sandipan Das <sandipan@...ux.ibm.com>,
        Prashant Bhole <bhole_prashant_q7@....ntt.co.jp>,
        Stephen Hemminger <stephen@...workplumber.org>,
        John Fastabend <john.fastabend@...il.com>,
        Taeung Song <treeze.taeung@...il.com>,
        Jiri Olsa <jolsa@...nel.org>,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Quentin Monnet <quentin.monnet@...ronome.com>,
        okash.khawaja@...il.com, netdev@...r.kernel.org
Subject: [patch 8/9] tools: bpftool: Cleanup license mess

Precise and non-ambiguous license information is important. The recent
relicensing of the bpftools introduced a license conflict.

The files have now:

     SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause

and

     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version
     * 2 of the License, or (at your option) any later version

Amazingly about 20 people acked that change and neither they nor the
committer noticed. Oh well.

Digging deeper: The files were imported from the iproute2 repository with
the GPL V2 or later boiler plate text in commit b66e907cfee2 ("tools:
bpftool: copy JSON writer from iproute2 repository")

Looking at the iproute2 repository at

  git://git.kernel.org/pub/scm/network/iproute2/iproute2.git

the following commit is the equivivalent:

  commit d9d8c839 ("json_writer: add SPDX Identifier (GPL-2/BSD-2)")

That commit explicitly removes the boiler plate and relicenses the code
uner GPL-2.0-only and BSD-2-Clause. As Steven wrote the original code and
also the relicensing commit, it's assumed that the relicensing was intended
to do exaclty that. Just the kernel side update failed to remove the boiler
plate. Do so now.

Fixes: 907b22365115 ("tools: bpftool: dual license all files")
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Jakub Kicinski <jakub.kicinski@...ronome.com>
Cc: Roman Gushchin <guro@...com>
Cc: YueHaibing <yuehaibing@...wei.com>
Cc: Yonghong Song <yhs@...com>
Cc: Stanislav Fomichev <sdf@...gle.com>
Cc: Sean Young <sean@...s.org>
Cc: Jiri Benc <jbenc@...hat.com>
Cc: David Calavera <david.calavera@...il.com>
Cc: Andrey Ignatov <rdna@...com>
Cc: Joe Stringer <joe@...d.net.nz>
Cc: David Ahern <dsahern@...il.com>
Cc: Alexei Starovoitov <alexei.starovoitov@...il.com>
Cc: Petar Penkov <ppenkov@...nford.edu>
Cc: Sandipan Das <sandipan@...ux.ibm.com>
Cc: Prashant Bhole <bhole_prashant_q7@....ntt.co.jp>
Cc: Stephen Hemminger <stephen@...workplumber.org>
Cc: John Fastabend <john.fastabend@...il.com>
Cc: Taeung Song <treeze.taeung@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Alexei Starovoitov <ast@...nel.org>
Cc: Daniel Borkmann <daniel@...earbox.net>
Cc: Quentin Monnet <quentin.monnet@...ronome.com>
CC: okash.khawaja@...il.com
Cc: netdev@...r.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly.

---
 tools/bpf/bpftool/json_writer.c |    7 +------
 tools/bpf/bpftool/json_writer.h |    5 -----
 2 files changed, 1 insertion(+), 11 deletions(-)

--- a/tools/bpf/bpftool/json_writer.c
+++ b/tools/bpf/bpftool/json_writer.c
@@ -1,15 +1,10 @@
-// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
 /*
  * Simple streaming JSON writer
  *
  * This takes care of the annoying bits of JSON syntax like the commas
  * after elements
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
  * Authors:	Stephen Hemminger <stephen@...workplumber.org>
  */
 
--- a/tools/bpf/bpftool/json_writer.h
+++ b/tools/bpf/bpftool/json_writer.h
@@ -5,11 +5,6 @@
  * This takes care of the annoying bits of JSON syntax like the commas
  * after elements
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
  * Authors:	Stephen Hemminger <stephen@...workplumber.org>
  */