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 08:07:57 -06:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2013-08-27 00:50:14 -06:00
|
|
|
#ifndef _NF_CONNTRACK_SYNPROXY_H
|
|
|
|
|
#define _NF_CONNTRACK_SYNPROXY_H
|
|
|
|
|
|
|
|
|
|
#include <net/netns/generic.h>
|
|
|
|
|
|
|
|
|
|
struct nf_conn_synproxy {
|
|
|
|
|
u32 isn;
|
|
|
|
|
u32 its;
|
|
|
|
|
u32 tsoff;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static inline struct nf_conn_synproxy *nfct_synproxy(const struct nf_conn *ct)
|
|
|
|
|
{
|
|
|
|
|
#if IS_ENABLED(CONFIG_NETFILTER_SYNPROXY)
|
|
|
|
|
return nf_ct_ext_find(ct, NF_CT_EXT_SYNPROXY);
|
|
|
|
|
#else
|
|
|
|
|
return NULL;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct nf_conn_synproxy *nfct_synproxy_ext_add(struct nf_conn *ct)
|
|
|
|
|
{
|
|
|
|
|
#if IS_ENABLED(CONFIG_NETFILTER_SYNPROXY)
|
|
|
|
|
return nf_ct_ext_add(ct, NF_CT_EXT_SYNPROXY, GFP_ATOMIC);
|
|
|
|
|
#else
|
|
|
|
|
return NULL;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-12 18:49:18 -06:00
|
|
|
static inline bool nf_ct_add_synproxy(struct nf_conn *ct,
|
|
|
|
|
const struct nf_conn *tmpl)
|
|
|
|
|
{
|
|
|
|
|
if (tmpl && nfct_synproxy(tmpl)) {
|
|
|
|
|
if (!nfct_seqadj_ext_add(ct))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (!nfct_synproxy_ext_add(ct))
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-27 00:50:14 -06:00
|
|
|
struct synproxy_stats {
|
|
|
|
|
unsigned int syn_received;
|
|
|
|
|
unsigned int cookie_invalid;
|
|
|
|
|
unsigned int cookie_valid;
|
|
|
|
|
unsigned int cookie_retrans;
|
|
|
|
|
unsigned int conn_reopened;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct synproxy_net {
|
|
|
|
|
struct nf_conn *tmpl;
|
|
|
|
|
struct synproxy_stats __percpu *stats;
|
2017-04-19 10:14:04 -06:00
|
|
|
unsigned int hook_ref4;
|
|
|
|
|
unsigned int hook_ref6;
|
2013-08-27 00:50:14 -06:00
|
|
|
};
|
|
|
|
|
|
netns: make struct pernet_operations::id unsigned int
Make struct pernet_operations::id unsigned.
There are 2 reasons to do so:
1)
This field is really an index into an zero based array and
thus is unsigned entity. Using negative value is out-of-bound
access by definition.
2)
On x86_64 unsigned 32-bit data which are mixed with pointers
via array indexing or offsets added or subtracted to pointers
are preffered to signed 32-bit data.
"int" being used as an array index needs to be sign-extended
to 64-bit before being used.
void f(long *p, int i)
{
g(p[i]);
}
roughly translates to
movsx rsi, esi
mov rdi, [rsi+...]
call g
MOVSX is 3 byte instruction which isn't necessary if the variable is
unsigned because x86_64 is zero extending by default.
Now, there is net_generic() function which, you guessed it right, uses
"int" as an array index:
static inline void *net_generic(const struct net *net, int id)
{
...
ptr = ng->ptr[id - 1];
...
}
And this function is used a lot, so those sign extensions add up.
Patch snipes ~1730 bytes on allyesconfig kernel (without all junk
messing with code generation):
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
Unfortunately some functions actually grow bigger.
This is a semmingly random artefact of code generation with register
allocator being used differently. gcc decides that some variable
needs to live in new r8+ registers and every access now requires REX
prefix. Or it is shifted into r12, so [r12+0] addressing mode has to be
used which is longer than [r8]
However, overall balance is in negative direction:
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
function old new delta
nfsd4_lock 3886 3959 +73
tipc_link_build_proto_msg 1096 1140 +44
mac80211_hwsim_new_radio 2776 2808 +32
tipc_mon_rcv 1032 1058 +26
svcauth_gss_legacy_init 1413 1429 +16
tipc_bcbase_select_primary 379 392 +13
nfsd4_exchange_id 1247 1260 +13
nfsd4_setclientid_confirm 782 793 +11
...
put_client_renew_locked 494 480 -14
ip_set_sockfn_get 730 716 -14
geneve_sock_add 829 813 -16
nfsd4_sequence_done 721 703 -18
nlmclnt_lookup_host 708 686 -22
nfsd4_lockt 1085 1063 -22
nfs_get_client 1077 1050 -27
tcf_bpf_init 1106 1076 -30
nfsd4_encode_fattr 5997 5930 -67
Total: Before=154856051, After=154854321, chg -0.00%
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-16 18:58:21 -07:00
|
|
|
extern unsigned int synproxy_net_id;
|
2013-08-27 00:50:14 -06:00
|
|
|
static inline struct synproxy_net *synproxy_pernet(struct net *net)
|
|
|
|
|
{
|
|
|
|
|
return net_generic(net, synproxy_net_id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct synproxy_options {
|
|
|
|
|
u8 options;
|
|
|
|
|
u8 wscale;
|
|
|
|
|
u16 mss;
|
|
|
|
|
u32 tsval;
|
|
|
|
|
u32 tsecr;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct tcphdr;
|
|
|
|
|
struct xt_synproxy_info;
|
2013-10-01 15:06:14 -06:00
|
|
|
bool synproxy_parse_options(const struct sk_buff *skb, unsigned int doff,
|
2013-09-23 12:37:48 -06:00
|
|
|
const struct tcphdr *th,
|
|
|
|
|
struct synproxy_options *opts);
|
|
|
|
|
unsigned int synproxy_options_size(const struct synproxy_options *opts);
|
|
|
|
|
void synproxy_build_options(struct tcphdr *th,
|
|
|
|
|
const struct synproxy_options *opts);
|
2013-08-27 00:50:14 -06:00
|
|
|
|
2013-09-23 12:37:48 -06:00
|
|
|
void synproxy_init_timestamp_cookie(const struct xt_synproxy_info *info,
|
|
|
|
|
struct synproxy_options *opts);
|
|
|
|
|
void synproxy_check_timestamp_cookie(struct synproxy_options *opts);
|
2013-08-27 00:50:14 -06:00
|
|
|
|
2013-09-23 12:37:48 -06:00
|
|
|
unsigned int synproxy_tstamp_adjust(struct sk_buff *skb, unsigned int protoff,
|
|
|
|
|
struct tcphdr *th, struct nf_conn *ct,
|
|
|
|
|
enum ip_conntrack_info ctinfo,
|
|
|
|
|
const struct nf_conn_synproxy *synproxy);
|
2013-08-27 00:50:14 -06:00
|
|
|
|
|
|
|
|
#endif /* _NF_CONNTRACK_SYNPROXY_H */
|