License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2013-03-22 00:33:47 +08:00
|
|
|
#ifndef _AF_NETLINK_H
|
|
|
|
|
#define _AF_NETLINK_H
|
|
|
|
|
|
2014-08-02 17:47:45 +08:00
|
|
|
#include <linux/rhashtable.h>
|
2015-01-16 18:37:14 +08:00
|
|
|
#include <linux/atomic.h>
|
2016-11-28 19:22:12 +08:00
|
|
|
#include <linux/workqueue.h>
|
2013-03-22 00:33:47 +08:00
|
|
|
#include <net/sock.h>
|
|
|
|
|
|
2017-04-04 09:13:32 +08:00
|
|
|
/* flags */
|
|
|
|
|
#define NETLINK_F_KERNEL_SOCKET 0x1
|
|
|
|
|
#define NETLINK_F_RECV_PKTINFO 0x2
|
|
|
|
|
#define NETLINK_F_BROADCAST_SEND_ERROR 0x4
|
|
|
|
|
#define NETLINK_F_RECV_NO_ENOBUFS 0x8
|
|
|
|
|
#define NETLINK_F_LISTEN_ALL_NSID 0x10
|
|
|
|
|
#define NETLINK_F_CAP_ACK 0x20
|
2017-04-12 20:34:04 +08:00
|
|
|
#define NETLINK_F_EXT_ACK 0x40
|
2017-04-04 09:13:32 +08:00
|
|
|
|
2013-03-22 00:33:47 +08:00
|
|
|
#define NLGRPSZ(x) (ALIGN(x, sizeof(unsigned long) * 8) / 8)
|
|
|
|
|
#define NLGRPLONGS(x) (NLGRPSZ(x)/sizeof(unsigned long))
|
|
|
|
|
|
|
|
|
|
struct netlink_sock {
|
|
|
|
|
/* struct sock has to be the first member of netlink_sock */
|
|
|
|
|
struct sock sk;
|
|
|
|
|
u32 portid;
|
|
|
|
|
u32 dst_portid;
|
|
|
|
|
u32 dst_group;
|
|
|
|
|
u32 flags;
|
|
|
|
|
u32 subscriptions;
|
|
|
|
|
u32 ngroups;
|
|
|
|
|
unsigned long *groups;
|
|
|
|
|
unsigned long state;
|
2014-03-08 04:02:33 +08:00
|
|
|
size_t max_recvmsg_len;
|
2013-03-22 00:33:47 +08:00
|
|
|
wait_queue_head_t wait;
|
netlink: Replace rhash_portid with bound
On Mon, Sep 21, 2015 at 02:20:22PM -0400, Tejun Heo wrote:
>
> store_release and load_acquire are different from the usual memory
> barriers and can't be paired this way. You have to pair store_release
> and load_acquire. Besides, it isn't a particularly good idea to
OK I've decided to drop the acquire/release helpers as they don't
help us at all and simply pessimises the code by using full memory
barriers (on some architectures) where only a write or read barrier
is needed.
> depend on memory barriers embedded in other data structures like the
> above. Here, especially, rhashtable_insert() would have write barrier
> *before* the entry is hashed not necessarily *after*, which means that
> in the above case, a socket which appears to have set bound to a
> reader might not visible when the reader tries to look up the socket
> on the hashtable.
But you are right we do need an explicit write barrier here to
ensure that the hashing is visible.
> There's no reason to be overly smart here. This isn't a crazy hot
> path, write barriers tend to be very cheap, store_release more so.
> Please just do smp_store_release() and note what it's paired with.
It's not about being overly smart. It's about actually understanding
what's going on with the code. I've seen too many instances of
people simply sprinkling synchronisation primitives around without
any knowledge of what is happening underneath, which is just a recipe
for creating hard-to-debug races.
> > @@ -1539,7 +1546,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
> > }
> > }
> >
> > - if (!nlk->portid) {
> > + if (!nlk->bound) {
>
> I don't think you can skip load_acquire here just because this is the
> second deref of the variable. That doesn't change anything. Race
> condition could still happen between the first and second tests and
> skipping the second would lead to the same kind of bug.
The reason this one is OK is because we do not use nlk->portid or
try to get nlk from the hash table before we return to user-space.
However, there is a real bug here that none of these acquire/release
helpers discovered. The two bound tests here used to be a single
one. Now that they are separate it is entirely possible for another
thread to come in the middle and bind the socket. So we need to
repeat the portid check in order to maintain consistency.
> > @@ -1587,7 +1594,7 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr,
> > !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND))
> > return -EPERM;
> >
> > - if (!nlk->portid)
> > + if (!nlk->bound)
>
> Don't we need load_acquire here too? Is this path holding a lock
> which makes that unnecessary?
Ditto.
---8<---
The commit 1f770c0a09da855a2b51af6d19de97fb955eca85 ("netlink:
Fix autobind race condition that leads to zero port ID") created
some new races that can occur due to inconcsistencies between the
two port IDs.
Tejun is right that a barrier is unavoidable. Therefore I am
reverting to the original patch that used a boolean to indicate
that a user netlink socket has been bound.
Barriers have been added where necessary to ensure that a valid
portid and the hashed socket is visible.
I have also changed netlink_insert to only return EBUSY if the
socket is bound to a portid different to the requested one. This
combined with only reading nlk->bound once in netlink_bind fixes
a race where two threads that bind the socket at the same time
with different port IDs may both succeed.
Fixes: 1f770c0a09da ("netlink: Fix autobind race condition that leads to zero port ID")
Reported-by: Tejun Heo <tj@kernel.org>
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Nacked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-22 11:38:56 +08:00
|
|
|
bool bound;
|
2013-08-16 06:31:06 +08:00
|
|
|
bool cb_running;
|
|
|
|
|
struct netlink_callback cb;
|
2013-03-22 00:33:47 +08:00
|
|
|
struct mutex *cb_mutex;
|
|
|
|
|
struct mutex cb_def_mutex;
|
|
|
|
|
void (*netlink_rcv)(struct sk_buff *skb);
|
2014-12-24 04:00:06 +08:00
|
|
|
int (*netlink_bind)(struct net *net, int group);
|
|
|
|
|
void (*netlink_unbind)(struct net *net, int group);
|
2013-03-22 00:33:47 +08:00
|
|
|
struct module *module;
|
2014-08-02 17:47:45 +08:00
|
|
|
|
|
|
|
|
struct rhash_head node;
|
2015-01-03 06:00:22 +08:00
|
|
|
struct rcu_head rcu;
|
2016-11-28 19:22:12 +08:00
|
|
|
struct work_struct work;
|
2013-03-22 00:33:47 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static inline struct netlink_sock *nlk_sk(struct sock *sk)
|
|
|
|
|
{
|
|
|
|
|
return container_of(sk, struct netlink_sock, sk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct netlink_table {
|
2014-08-02 17:47:45 +08:00
|
|
|
struct rhashtable hash;
|
2013-03-22 00:33:47 +08:00
|
|
|
struct hlist_head mc_list;
|
|
|
|
|
struct listeners __rcu *listeners;
|
|
|
|
|
unsigned int flags;
|
|
|
|
|
unsigned int groups;
|
|
|
|
|
struct mutex *cb_mutex;
|
|
|
|
|
struct module *module;
|
2014-12-24 04:00:06 +08:00
|
|
|
int (*bind)(struct net *net, int group);
|
|
|
|
|
void (*unbind)(struct net *net, int group);
|
2013-06-06 14:49:11 +08:00
|
|
|
bool (*compare)(struct net *net, struct sock *sock);
|
2013-03-22 00:33:47 +08:00
|
|
|
int registered;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern struct netlink_table *nl_table;
|
|
|
|
|
extern rwlock_t nl_table_lock;
|
|
|
|
|
|
|
|
|
|
#endif
|