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 */
|
keys: add new trusted key-type
Define a new kernel key-type called 'trusted'. Trusted keys are random
number symmetric keys, generated and RSA-sealed by the TPM. The TPM
only unseals the keys, if the boot PCRs and other criteria match.
Userspace can only ever see encrypted blobs.
Based on suggestions by Jason Gunthorpe, several new options have been
added to support additional usages.
The new options are:
migratable= designates that the key may/may not ever be updated
(resealed under a new key, new pcrinfo or new auth.)
pcrlock=n extends the designated PCR 'n' with a random value,
so that a key sealed to that PCR may not be unsealed
again until after a reboot.
keyhandle= specifies the sealing/unsealing key handle.
keyauth= specifies the sealing/unsealing key auth.
blobauth= specifies the sealed data auth.
Implementation of a kernel reserved locality for trusted keys will be
investigated for a possible future extension.
Changelog:
- Updated and added examples to Documentation/keys-trusted-encrypted.txt
- Moved generic TPM constants to include/linux/tpm_command.h
(David Howell's suggestion.)
- trusted_defined.c: replaced kzalloc with kmalloc, added pcrlock failure
error handling, added const qualifiers where appropriate.
- moved to late_initcall
- updated from hash to shash (suggestion by David Howells)
- reduced worst stack usage (tpm_seal) from 530 to 312 bytes
- moved documentation to Documentation directory (suggestion by David Howells)
- all the other code cleanups suggested by David Howells
- Add pcrlock CAP_SYS_ADMIN dependency (based on comment by Jason Gunthorpe)
- New options: migratable, pcrlock, keyhandle, keyauth, blobauth (based on
discussions with Jason Gunthorpe)
- Free payload on failure to create key(reported/fixed by Roberto Sassu)
- Updated Kconfig and other descriptions (based on Serge Hallyn's suggestion)
- Replaced kzalloc() with kmalloc() (reported by Serge Hallyn)
Signed-off-by: David Safford <safford@watson.ibm.com>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
2010-11-24 06:50:34 +08:00
|
|
|
#ifndef __TRUSTED_KEY_H
|
|
|
|
#define __TRUSTED_KEY_H
|
|
|
|
|
|
|
|
/* implementation specific TPM constants */
|
|
|
|
#define MAX_BUF_SIZE 512
|
|
|
|
#define TPM_GETRANDOM_SIZE 14
|
|
|
|
#define TPM_OSAP_SIZE 36
|
|
|
|
#define TPM_OIAP_SIZE 10
|
|
|
|
#define TPM_SEAL_SIZE 87
|
|
|
|
#define TPM_UNSEAL_SIZE 104
|
|
|
|
#define TPM_SIZE_OFFSET 2
|
|
|
|
#define TPM_RETURN_OFFSET 6
|
|
|
|
#define TPM_DATA_OFFSET 10
|
|
|
|
|
|
|
|
#define LOAD32(buffer, offset) (ntohl(*(uint32_t *)&buffer[offset]))
|
|
|
|
#define LOAD32N(buffer, offset) (*(uint32_t *)&buffer[offset])
|
|
|
|
#define LOAD16(buffer, offset) (ntohs(*(uint16_t *)&buffer[offset]))
|
|
|
|
|
|
|
|
struct tpm_buf {
|
|
|
|
int len;
|
|
|
|
unsigned char data[MAX_BUF_SIZE];
|
|
|
|
};
|
|
|
|
|
|
|
|
#define INIT_BUF(tb) (tb->len = 0)
|
|
|
|
|
|
|
|
struct osapsess {
|
|
|
|
uint32_t handle;
|
|
|
|
unsigned char secret[SHA1_DIGEST_SIZE];
|
|
|
|
unsigned char enonce[TPM_NONCE_SIZE];
|
|
|
|
};
|
|
|
|
|
|
|
|
/* discrete values, but have to store in uint16_t for TPM use */
|
|
|
|
enum {
|
|
|
|
SEAL_keytype = 1,
|
|
|
|
SRK_keytype = 4
|
|
|
|
};
|
|
|
|
|
|
|
|
#define TPM_DEBUG 0
|
|
|
|
|
|
|
|
#if TPM_DEBUG
|
|
|
|
static inline void dump_options(struct trusted_key_options *o)
|
|
|
|
{
|
|
|
|
pr_info("trusted_key: sealing key type %d\n", o->keytype);
|
|
|
|
pr_info("trusted_key: sealing key handle %0X\n", o->keyhandle);
|
|
|
|
pr_info("trusted_key: pcrlock %d\n", o->pcrlock);
|
|
|
|
pr_info("trusted_key: pcrinfo %d\n", o->pcrinfo_len);
|
|
|
|
print_hex_dump(KERN_INFO, "pcrinfo ", DUMP_PREFIX_NONE,
|
|
|
|
16, 1, o->pcrinfo, o->pcrinfo_len, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dump_payload(struct trusted_key_payload *p)
|
|
|
|
{
|
|
|
|
pr_info("trusted_key: key_len %d\n", p->key_len);
|
|
|
|
print_hex_dump(KERN_INFO, "key ", DUMP_PREFIX_NONE,
|
|
|
|
16, 1, p->key, p->key_len, 0);
|
|
|
|
pr_info("trusted_key: bloblen %d\n", p->blob_len);
|
|
|
|
print_hex_dump(KERN_INFO, "blob ", DUMP_PREFIX_NONE,
|
|
|
|
16, 1, p->blob, p->blob_len, 0);
|
|
|
|
pr_info("trusted_key: migratable %d\n", p->migratable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dump_sess(struct osapsess *s)
|
|
|
|
{
|
|
|
|
print_hex_dump(KERN_INFO, "trusted-key: handle ", DUMP_PREFIX_NONE,
|
|
|
|
16, 1, &s->handle, 4, 0);
|
|
|
|
pr_info("trusted-key: secret:\n");
|
|
|
|
print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE,
|
|
|
|
16, 1, &s->secret, SHA1_DIGEST_SIZE, 0);
|
|
|
|
pr_info("trusted-key: enonce:\n");
|
|
|
|
print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE,
|
|
|
|
16, 1, &s->enonce, SHA1_DIGEST_SIZE, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dump_tpm_buf(unsigned char *buf)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
|
|
|
|
pr_info("\ntrusted-key: tpm buffer\n");
|
|
|
|
len = LOAD32(buf, TPM_SIZE_OFFSET);
|
|
|
|
print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 16, 1, buf, len, 0);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void dump_options(struct trusted_key_options *o)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dump_payload(struct trusted_key_payload *p)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dump_sess(struct osapsess *s)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dump_tpm_buf(unsigned char *buf)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static inline void store8(struct tpm_buf *buf, const unsigned char value)
|
|
|
|
{
|
|
|
|
buf->data[buf->len++] = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void store16(struct tpm_buf *buf, const uint16_t value)
|
|
|
|
{
|
|
|
|
*(uint16_t *) & buf->data[buf->len] = htons(value);
|
|
|
|
buf->len += sizeof value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void store32(struct tpm_buf *buf, const uint32_t value)
|
|
|
|
{
|
|
|
|
*(uint32_t *) & buf->data[buf->len] = htonl(value);
|
|
|
|
buf->len += sizeof value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void storebytes(struct tpm_buf *buf, const unsigned char *in,
|
|
|
|
const int len)
|
|
|
|
{
|
|
|
|
memcpy(buf->data + buf->len, in, len);
|
|
|
|
buf->len += len;
|
|
|
|
}
|
|
|
|
#endif
|