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 21:07:57 +07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* linux/lib/string.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* stupid library routines.. The optimized versions should generally be found
|
|
|
|
* as inline code in <asm-xx/string.h>
|
|
|
|
*
|
|
|
|
* These are buggy as well..
|
|
|
|
*
|
|
|
|
* * Fri Jun 25 1999, Ingo Oeser <ioe@informatik.tu-chemnitz.de>
|
|
|
|
* - Added strsep() which will replace strtok() soon (because strsep() is
|
|
|
|
* reentrant and should be faster). Use only strsep() in new code, please.
|
|
|
|
*
|
|
|
|
* * Sat Feb 09 2002, Jason Thomas <jason@topic.com.au>,
|
|
|
|
* Matthew Hawkins <matt@mh.dropbear.id.au>
|
|
|
|
* - Kissed strtok() goodbye
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/ctype.h>
|
2011-11-17 09:29:17 +07:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/export.h>
|
2012-01-21 06:35:53 +07:00
|
|
|
#include <linux/bug.h>
|
2011-11-17 09:29:17 +07:00
|
|
|
#include <linux/errno.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2015-04-29 23:52:04 +07:00
|
|
|
#include <asm/byteorder.h>
|
|
|
|
#include <asm/word-at-a-time.h>
|
|
|
|
#include <asm/page.h>
|
|
|
|
|
2014-10-14 05:54:25 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRNCASECMP
|
2005-04-17 05:20:36 +07:00
|
|
|
/**
|
2014-10-14 05:54:25 +07:00
|
|
|
* strncasecmp - Case insensitive, length-limited string comparison
|
2005-04-17 05:20:36 +07:00
|
|
|
* @s1: One string
|
|
|
|
* @s2: The other string
|
|
|
|
* @len: the maximum number of characters to compare
|
|
|
|
*/
|
2014-10-14 05:54:25 +07:00
|
|
|
int strncasecmp(const char *s1, const char *s2, size_t len)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
/* Yes, Virginia, it had better be unsigned */
|
|
|
|
unsigned char c1, c2;
|
|
|
|
|
2010-03-06 04:43:11 +07:00
|
|
|
if (!len)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
do {
|
|
|
|
c1 = *s1++;
|
|
|
|
c2 = *s2++;
|
|
|
|
if (!c1 || !c2)
|
|
|
|
break;
|
|
|
|
if (c1 == c2)
|
|
|
|
continue;
|
|
|
|
c1 = tolower(c1);
|
|
|
|
c2 = tolower(c2);
|
|
|
|
if (c1 != c2)
|
|
|
|
break;
|
|
|
|
} while (--len);
|
2005-04-17 05:20:36 +07:00
|
|
|
return (int)c1 - (int)c2;
|
|
|
|
}
|
2014-10-14 05:54:25 +07:00
|
|
|
EXPORT_SYMBOL(strncasecmp);
|
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2007-03-29 15:18:42 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRCASECMP
|
|
|
|
int strcasecmp(const char *s1, const char *s2)
|
|
|
|
{
|
|
|
|
int c1, c2;
|
|
|
|
|
|
|
|
do {
|
|
|
|
c1 = tolower(*s1++);
|
|
|
|
c2 = tolower(*s2++);
|
|
|
|
} while (c1 == c2 && c1 != 0);
|
|
|
|
return c1 - c2;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strcasecmp);
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRCPY
|
|
|
|
/**
|
|
|
|
* strcpy - Copy a %NUL terminated string
|
|
|
|
* @dest: Where to copy the string to
|
|
|
|
* @src: Where to copy the string from
|
|
|
|
*/
|
2005-05-06 06:15:17 +07:00
|
|
|
#undef strcpy
|
2005-10-31 06:02:11 +07:00
|
|
|
char *strcpy(char *dest, const char *src)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
char *tmp = dest;
|
|
|
|
|
|
|
|
while ((*dest++ = *src++) != '\0')
|
|
|
|
/* nothing */;
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strcpy);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRNCPY
|
|
|
|
/**
|
2014-06-05 06:11:47 +07:00
|
|
|
* strncpy - Copy a length-limited, C-string
|
2005-04-17 05:20:36 +07:00
|
|
|
* @dest: Where to copy the string to
|
|
|
|
* @src: Where to copy the string from
|
|
|
|
* @count: The maximum number of bytes to copy
|
|
|
|
*
|
|
|
|
* The result is not %NUL-terminated if the source exceeds
|
|
|
|
* @count bytes.
|
2005-05-06 06:16:20 +07:00
|
|
|
*
|
|
|
|
* In the case where the length of @src is less than that of
|
|
|
|
* count, the remainder of @dest will be padded with %NUL.
|
|
|
|
*
|
2005-04-17 05:20:36 +07:00
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
char *strncpy(char *dest, const char *src, size_t count)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
char *tmp = dest;
|
|
|
|
|
|
|
|
while (count) {
|
2005-10-31 06:02:11 +07:00
|
|
|
if ((*tmp = *src) != 0)
|
|
|
|
src++;
|
2005-04-17 05:20:36 +07:00
|
|
|
tmp++;
|
|
|
|
count--;
|
|
|
|
}
|
|
|
|
return dest;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strncpy);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRLCPY
|
|
|
|
/**
|
2014-06-05 06:11:47 +07:00
|
|
|
* strlcpy - Copy a C-string into a sized buffer
|
2005-04-17 05:20:36 +07:00
|
|
|
* @dest: Where to copy the string to
|
|
|
|
* @src: Where to copy the string from
|
|
|
|
* @size: size of destination buffer
|
|
|
|
*
|
2017-03-31 03:11:36 +07:00
|
|
|
* Compatible with ``*BSD``: the result is always a valid
|
2005-04-17 05:20:36 +07:00
|
|
|
* NUL-terminated string that fits in the buffer (unless,
|
|
|
|
* of course, the buffer size is zero). It does not pad
|
|
|
|
* out the result like strncpy() does.
|
|
|
|
*/
|
|
|
|
size_t strlcpy(char *dest, const char *src, size_t size)
|
|
|
|
{
|
|
|
|
size_t ret = strlen(src);
|
|
|
|
|
|
|
|
if (size) {
|
2005-10-31 06:02:11 +07:00
|
|
|
size_t len = (ret >= size) ? size - 1 : ret;
|
2005-04-17 05:20:36 +07:00
|
|
|
memcpy(dest, src, len);
|
|
|
|
dest[len] = '\0';
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strlcpy);
|
|
|
|
#endif
|
|
|
|
|
2015-04-29 23:52:04 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRSCPY
|
|
|
|
/**
|
|
|
|
* strscpy - Copy a C-string into a sized buffer
|
|
|
|
* @dest: Where to copy the string to
|
|
|
|
* @src: Where to copy the string from
|
|
|
|
* @count: Size of destination buffer
|
|
|
|
*
|
|
|
|
* Copy the string, or as much of it as fits, into the dest buffer.
|
|
|
|
* The routine returns the number of characters copied (not including
|
|
|
|
* the trailing NUL) or -E2BIG if the destination buffer wasn't big enough.
|
|
|
|
* The behavior is undefined if the string buffers overlap.
|
|
|
|
* The destination buffer is always NUL terminated, unless it's zero-sized.
|
|
|
|
*
|
|
|
|
* Preferred to strlcpy() since the API doesn't require reading memory
|
|
|
|
* from the src string beyond the specified "count" bytes, and since
|
|
|
|
* the return value is easier to error-check than strlcpy()'s.
|
|
|
|
* In addition, the implementation is robust to the string changing out
|
|
|
|
* from underneath it, unlike the current strlcpy() implementation.
|
|
|
|
*
|
|
|
|
* Preferred to strncpy() since it always returns a valid string, and
|
|
|
|
* doesn't unnecessarily force the tail of the destination buffer to be
|
|
|
|
* zeroed. If the zeroing is desired, it's likely cleaner to use strscpy()
|
|
|
|
* with an overflow test, then just memset() the tail of the dest buffer.
|
|
|
|
*/
|
|
|
|
ssize_t strscpy(char *dest, const char *src, size_t count)
|
|
|
|
{
|
|
|
|
const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
|
|
|
|
size_t max = count;
|
|
|
|
long res = 0;
|
|
|
|
|
|
|
|
if (count == 0)
|
|
|
|
return -E2BIG;
|
|
|
|
|
|
|
|
#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
|
|
|
|
/*
|
|
|
|
* If src is unaligned, don't cross a page boundary,
|
|
|
|
* since we don't know if the next page is mapped.
|
|
|
|
*/
|
|
|
|
if ((long)src & (sizeof(long) - 1)) {
|
|
|
|
size_t limit = PAGE_SIZE - ((long)src & (PAGE_SIZE - 1));
|
|
|
|
if (limit < max)
|
|
|
|
max = limit;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
/* If src or dest is unaligned, don't do word-at-a-time. */
|
|
|
|
if (((long) dest | (long) src) & (sizeof(long) - 1))
|
|
|
|
max = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
while (max >= sizeof(unsigned long)) {
|
|
|
|
unsigned long c, data;
|
|
|
|
|
|
|
|
c = *(unsigned long *)(src+res);
|
|
|
|
if (has_zero(c, &data, &constants)) {
|
|
|
|
data = prep_zero_mask(c, data, &constants);
|
|
|
|
data = create_zero_mask(data);
|
2015-10-06 23:37:41 +07:00
|
|
|
*(unsigned long *)(dest+res) = c & zero_bytemask(data);
|
2015-04-29 23:52:04 +07:00
|
|
|
return res + find_zero(data);
|
|
|
|
}
|
2015-10-06 23:37:41 +07:00
|
|
|
*(unsigned long *)(dest+res) = c;
|
2015-04-29 23:52:04 +07:00
|
|
|
res += sizeof(unsigned long);
|
|
|
|
count -= sizeof(unsigned long);
|
|
|
|
max -= sizeof(unsigned long);
|
|
|
|
}
|
|
|
|
|
|
|
|
while (count) {
|
|
|
|
char c;
|
|
|
|
|
|
|
|
c = src[res];
|
|
|
|
dest[res] = c;
|
|
|
|
if (!c)
|
|
|
|
return res;
|
|
|
|
res++;
|
|
|
|
count--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Hit buffer length without finding a NUL; force NUL-termination. */
|
|
|
|
if (res)
|
|
|
|
dest[res-1] = '\0';
|
|
|
|
|
|
|
|
return -E2BIG;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strscpy);
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRCAT
|
|
|
|
/**
|
|
|
|
* strcat - Append one %NUL-terminated string to another
|
|
|
|
* @dest: The string to be appended to
|
|
|
|
* @src: The string to append to it
|
|
|
|
*/
|
2005-05-06 06:15:17 +07:00
|
|
|
#undef strcat
|
2005-10-31 06:02:11 +07:00
|
|
|
char *strcat(char *dest, const char *src)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
char *tmp = dest;
|
|
|
|
|
|
|
|
while (*dest)
|
|
|
|
dest++;
|
|
|
|
while ((*dest++ = *src++) != '\0')
|
|
|
|
;
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strcat);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRNCAT
|
|
|
|
/**
|
2014-06-05 06:11:47 +07:00
|
|
|
* strncat - Append a length-limited, C-string to another
|
2005-04-17 05:20:36 +07:00
|
|
|
* @dest: The string to be appended to
|
|
|
|
* @src: The string to append to it
|
|
|
|
* @count: The maximum numbers of bytes to copy
|
|
|
|
*
|
2007-02-10 16:45:59 +07:00
|
|
|
* Note that in contrast to strncpy(), strncat() ensures the result is
|
2005-04-17 05:20:36 +07:00
|
|
|
* terminated.
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
char *strncat(char *dest, const char *src, size_t count)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
char *tmp = dest;
|
|
|
|
|
|
|
|
if (count) {
|
|
|
|
while (*dest)
|
|
|
|
dest++;
|
|
|
|
while ((*dest++ = *src++) != 0) {
|
|
|
|
if (--count == 0) {
|
|
|
|
*dest = '\0';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strncat);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRLCAT
|
|
|
|
/**
|
2014-06-05 06:11:47 +07:00
|
|
|
* strlcat - Append a length-limited, C-string to another
|
2005-04-17 05:20:36 +07:00
|
|
|
* @dest: The string to be appended to
|
|
|
|
* @src: The string to append to it
|
|
|
|
* @count: The size of the destination buffer.
|
|
|
|
*/
|
|
|
|
size_t strlcat(char *dest, const char *src, size_t count)
|
|
|
|
{
|
|
|
|
size_t dsize = strlen(dest);
|
|
|
|
size_t len = strlen(src);
|
|
|
|
size_t res = dsize + len;
|
|
|
|
|
|
|
|
/* This would be a bug */
|
|
|
|
BUG_ON(dsize >= count);
|
|
|
|
|
|
|
|
dest += dsize;
|
|
|
|
count -= dsize;
|
|
|
|
if (len >= count)
|
|
|
|
len = count-1;
|
|
|
|
memcpy(dest, src, len);
|
|
|
|
dest[len] = 0;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strlcat);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRCMP
|
|
|
|
/**
|
|
|
|
* strcmp - Compare two strings
|
|
|
|
* @cs: One string
|
|
|
|
* @ct: Another string
|
|
|
|
*/
|
2005-05-06 06:15:17 +07:00
|
|
|
#undef strcmp
|
2005-10-31 06:02:11 +07:00
|
|
|
int strcmp(const char *cs, const char *ct)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2009-11-19 04:31:52 +07:00
|
|
|
unsigned char c1, c2;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
while (1) {
|
2009-11-19 04:31:52 +07:00
|
|
|
c1 = *cs++;
|
|
|
|
c2 = *ct++;
|
|
|
|
if (c1 != c2)
|
|
|
|
return c1 < c2 ? -1 : 1;
|
|
|
|
if (!c1)
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
}
|
2009-11-19 04:31:52 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strcmp);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRNCMP
|
|
|
|
/**
|
|
|
|
* strncmp - Compare two length-limited strings
|
|
|
|
* @cs: One string
|
|
|
|
* @ct: Another string
|
|
|
|
* @count: The maximum number of bytes to compare
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
int strncmp(const char *cs, const char *ct, size_t count)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2009-11-19 04:31:52 +07:00
|
|
|
unsigned char c1, c2;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
while (count) {
|
2009-11-19 04:31:52 +07:00
|
|
|
c1 = *cs++;
|
|
|
|
c2 = *ct++;
|
|
|
|
if (c1 != c2)
|
|
|
|
return c1 < c2 ? -1 : 1;
|
|
|
|
if (!c1)
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
count--;
|
|
|
|
}
|
2009-11-19 04:31:52 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strncmp);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRCHR
|
|
|
|
/**
|
|
|
|
* strchr - Find the first occurrence of a character in a string
|
|
|
|
* @s: The string to be searched
|
|
|
|
* @c: The character to search for
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
char *strchr(const char *s, int c)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2005-10-31 06:02:11 +07:00
|
|
|
for (; *s != (char)c; ++s)
|
2005-04-17 05:20:36 +07:00
|
|
|
if (*s == '\0')
|
|
|
|
return NULL;
|
2005-10-31 06:02:11 +07:00
|
|
|
return (char *)s;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strchr);
|
|
|
|
#endif
|
|
|
|
|
2014-03-15 00:00:14 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRCHRNUL
|
|
|
|
/**
|
|
|
|
* strchrnul - Find and return a character in a string, or end of string
|
|
|
|
* @s: The string to be searched
|
|
|
|
* @c: The character to search for
|
|
|
|
*
|
|
|
|
* Returns pointer to first occurrence of 'c' in s. If c is not found, then
|
|
|
|
* return a pointer to the null byte at the end of s.
|
|
|
|
*/
|
|
|
|
char *strchrnul(const char *s, int c)
|
|
|
|
{
|
|
|
|
while (*s && *s != (char)c)
|
|
|
|
s++;
|
|
|
|
return (char *)s;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strchrnul);
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRRCHR
|
|
|
|
/**
|
|
|
|
* strrchr - Find the last occurrence of a character in a string
|
|
|
|
* @s: The string to be searched
|
|
|
|
* @c: The character to search for
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
char *strrchr(const char *s, int c)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2015-02-14 05:36:44 +07:00
|
|
|
const char *last = NULL;
|
|
|
|
do {
|
|
|
|
if (*s == (char)c)
|
|
|
|
last = s;
|
|
|
|
} while (*s++);
|
|
|
|
return (char *)last;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strrchr);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRNCHR
|
|
|
|
/**
|
|
|
|
* strnchr - Find a character in a length limited string
|
|
|
|
* @s: The string to be searched
|
|
|
|
* @count: The number of characters to be searched
|
|
|
|
* @c: The character to search for
|
|
|
|
*/
|
|
|
|
char *strnchr(const char *s, size_t count, int c)
|
|
|
|
{
|
|
|
|
for (; count-- && *s != '\0'; ++s)
|
2005-10-31 06:02:11 +07:00
|
|
|
if (*s == (char)c)
|
|
|
|
return (char *)s;
|
2005-04-17 05:20:36 +07:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strnchr);
|
|
|
|
#endif
|
|
|
|
|
2009-12-15 09:01:04 +07:00
|
|
|
/**
|
2009-12-22 05:37:22 +07:00
|
|
|
* skip_spaces - Removes leading whitespace from @str.
|
|
|
|
* @str: The string to be stripped.
|
2009-12-15 09:01:04 +07:00
|
|
|
*
|
2009-12-22 05:37:22 +07:00
|
|
|
* Returns a pointer to the first non-whitespace character in @str.
|
2009-12-15 09:01:04 +07:00
|
|
|
*/
|
|
|
|
char *skip_spaces(const char *str)
|
|
|
|
{
|
|
|
|
while (isspace(*str))
|
|
|
|
++str;
|
|
|
|
return (char *)str;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(skip_spaces);
|
|
|
|
|
2006-06-23 16:05:44 +07:00
|
|
|
/**
|
2009-12-15 09:01:15 +07:00
|
|
|
* strim - Removes leading and trailing whitespace from @s.
|
2006-06-23 16:05:44 +07:00
|
|
|
* @s: The string to be stripped.
|
|
|
|
*
|
|
|
|
* Note that the first trailing whitespace is replaced with a %NUL-terminator
|
|
|
|
* in the given string @s. Returns a pointer to the first non-whitespace
|
|
|
|
* character in @s.
|
|
|
|
*/
|
2009-12-15 09:01:15 +07:00
|
|
|
char *strim(char *s)
|
2006-06-23 16:05:44 +07:00
|
|
|
{
|
|
|
|
size_t size;
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
size = strlen(s);
|
|
|
|
if (!size)
|
|
|
|
return s;
|
|
|
|
|
|
|
|
end = s + size - 1;
|
2006-10-29 00:38:47 +07:00
|
|
|
while (end >= s && isspace(*end))
|
2006-06-23 16:05:44 +07:00
|
|
|
end--;
|
|
|
|
*(end + 1) = '\0';
|
|
|
|
|
2011-11-01 07:12:37 +07:00
|
|
|
return skip_spaces(s);
|
2006-06-23 16:05:44 +07:00
|
|
|
}
|
2009-12-15 09:01:15 +07:00
|
|
|
EXPORT_SYMBOL(strim);
|
2006-06-23 16:05:44 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRLEN
|
|
|
|
/**
|
|
|
|
* strlen - Find the length of a string
|
|
|
|
* @s: The string to be sized
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
size_t strlen(const char *s)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
const char *sc;
|
|
|
|
|
|
|
|
for (sc = s; *sc != '\0'; ++sc)
|
|
|
|
/* nothing */;
|
|
|
|
return sc - s;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strlen);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRNLEN
|
|
|
|
/**
|
|
|
|
* strnlen - Find the length of a length-limited string
|
|
|
|
* @s: The string to be sized
|
|
|
|
* @count: The maximum number of bytes to search
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
size_t strnlen(const char *s, size_t count)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
const char *sc;
|
|
|
|
|
|
|
|
for (sc = s; count-- && *sc != '\0'; ++sc)
|
|
|
|
/* nothing */;
|
|
|
|
return sc - s;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strnlen);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRSPN
|
|
|
|
/**
|
2007-02-10 16:45:59 +07:00
|
|
|
* strspn - Calculate the length of the initial substring of @s which only contain letters in @accept
|
2005-04-17 05:20:36 +07:00
|
|
|
* @s: The string to be searched
|
|
|
|
* @accept: The string to search for
|
|
|
|
*/
|
|
|
|
size_t strspn(const char *s, const char *accept)
|
|
|
|
{
|
|
|
|
const char *p;
|
|
|
|
const char *a;
|
|
|
|
size_t count = 0;
|
|
|
|
|
|
|
|
for (p = s; *p != '\0'; ++p) {
|
|
|
|
for (a = accept; *a != '\0'; ++a) {
|
|
|
|
if (*p == *a)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*a == '\0')
|
|
|
|
return count;
|
|
|
|
++count;
|
|
|
|
}
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(strspn);
|
|
|
|
#endif
|
|
|
|
|
2006-04-11 12:53:57 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRCSPN
|
2005-04-17 05:20:36 +07:00
|
|
|
/**
|
2007-02-10 16:45:59 +07:00
|
|
|
* strcspn - Calculate the length of the initial substring of @s which does not contain letters in @reject
|
2005-04-17 05:20:36 +07:00
|
|
|
* @s: The string to be searched
|
|
|
|
* @reject: The string to avoid
|
|
|
|
*/
|
|
|
|
size_t strcspn(const char *s, const char *reject)
|
|
|
|
{
|
|
|
|
const char *p;
|
|
|
|
const char *r;
|
|
|
|
size_t count = 0;
|
|
|
|
|
|
|
|
for (p = s; *p != '\0'; ++p) {
|
|
|
|
for (r = reject; *r != '\0'; ++r) {
|
|
|
|
if (*p == *r)
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
++count;
|
|
|
|
}
|
|
|
|
return count;
|
2005-10-31 06:02:11 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
EXPORT_SYMBOL(strcspn);
|
2006-04-11 12:53:57 +07:00
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRPBRK
|
|
|
|
/**
|
|
|
|
* strpbrk - Find the first occurrence of a set of characters
|
|
|
|
* @cs: The string to be searched
|
|
|
|
* @ct: The characters to search for
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
char *strpbrk(const char *cs, const char *ct)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2005-10-31 06:02:11 +07:00
|
|
|
const char *sc1, *sc2;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2005-10-31 06:02:11 +07:00
|
|
|
for (sc1 = cs; *sc1 != '\0'; ++sc1) {
|
|
|
|
for (sc2 = ct; *sc2 != '\0'; ++sc2) {
|
2005-04-17 05:20:36 +07:00
|
|
|
if (*sc1 == *sc2)
|
2005-10-31 06:02:11 +07:00
|
|
|
return (char *)sc1;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-04-11 12:53:56 +07:00
|
|
|
EXPORT_SYMBOL(strpbrk);
|
2005-04-17 05:20:36 +07:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRSEP
|
|
|
|
/**
|
|
|
|
* strsep - Split a string into tokens
|
|
|
|
* @s: The string to be searched
|
|
|
|
* @ct: The characters to search for
|
|
|
|
*
|
|
|
|
* strsep() updates @s to point after the token, ready for the next call.
|
|
|
|
*
|
|
|
|
* It returns empty tokens, too, behaving exactly like the libc function
|
|
|
|
* of that name. In fact, it was stolen from glibc2 and de-fancy-fied.
|
|
|
|
* Same semantics, slimmer shape. ;)
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
char *strsep(char **s, const char *ct)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2005-10-31 06:02:11 +07:00
|
|
|
char *sbegin = *s;
|
|
|
|
char *end;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (sbegin == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
end = strpbrk(sbegin, ct);
|
|
|
|
if (end)
|
|
|
|
*end++ = '\0';
|
|
|
|
*s = end;
|
|
|
|
return sbegin;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strsep);
|
|
|
|
#endif
|
|
|
|
|
2008-05-01 18:34:42 +07:00
|
|
|
/**
|
|
|
|
* sysfs_streq - return true if strings are equal, modulo trailing newline
|
|
|
|
* @s1: one string
|
|
|
|
* @s2: another string
|
|
|
|
*
|
|
|
|
* This routine returns true iff two strings are equal, treating both
|
|
|
|
* NUL and newline-then-NUL as equivalent string terminations. It's
|
|
|
|
* geared for use with sysfs input strings, which generally terminate
|
|
|
|
* with newlines but are compared against values without newlines.
|
|
|
|
*/
|
|
|
|
bool sysfs_streq(const char *s1, const char *s2)
|
|
|
|
{
|
|
|
|
while (*s1 && *s1 == *s2) {
|
|
|
|
s1++;
|
|
|
|
s2++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*s1 == *s2)
|
|
|
|
return true;
|
|
|
|
if (!*s1 && *s2 == '\n' && !s2[1])
|
|
|
|
return true;
|
|
|
|
if (*s1 == '\n' && !s1[1] && !*s2)
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(sysfs_streq);
|
|
|
|
|
2016-03-18 04:22:14 +07:00
|
|
|
/**
|
|
|
|
* match_string - matches given string in an array
|
|
|
|
* @array: array of strings
|
|
|
|
* @n: number of strings in the array or -1 for NULL terminated arrays
|
|
|
|
* @string: string to match with
|
|
|
|
*
|
|
|
|
* Return:
|
|
|
|
* index of a @string in the @array if matches, or %-EINVAL otherwise.
|
|
|
|
*/
|
|
|
|
int match_string(const char * const *array, size_t n, const char *string)
|
|
|
|
{
|
|
|
|
int index;
|
|
|
|
const char *item;
|
|
|
|
|
|
|
|
for (index = 0; index < n; index++) {
|
|
|
|
item = array[index];
|
|
|
|
if (!item)
|
|
|
|
break;
|
|
|
|
if (!strcmp(item, string))
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(match_string);
|
|
|
|
|
2017-03-21 18:56:46 +07:00
|
|
|
/**
|
|
|
|
* __sysfs_match_string - matches given string in an array
|
|
|
|
* @array: array of strings
|
|
|
|
* @n: number of strings in the array or -1 for NULL terminated arrays
|
|
|
|
* @str: string to match with
|
|
|
|
*
|
|
|
|
* Returns index of @str in the @array or -EINVAL, just like match_string().
|
|
|
|
* Uses sysfs_streq instead of strcmp for matching.
|
|
|
|
*/
|
|
|
|
int __sysfs_match_string(const char * const *array, size_t n, const char *str)
|
|
|
|
{
|
|
|
|
const char *item;
|
|
|
|
int index;
|
|
|
|
|
|
|
|
for (index = 0; index < n; index++) {
|
|
|
|
item = array[index];
|
|
|
|
if (!item)
|
|
|
|
break;
|
|
|
|
if (sysfs_streq(item, str))
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__sysfs_match_string);
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
#ifndef __HAVE_ARCH_MEMSET
|
|
|
|
/**
|
|
|
|
* memset - Fill a region of memory with the given value
|
|
|
|
* @s: Pointer to the start of the area.
|
|
|
|
* @c: The byte to fill the area with
|
|
|
|
* @count: The size of the area.
|
|
|
|
*
|
|
|
|
* Do not use memset() to access IO space, use memset_io() instead.
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
void *memset(void *s, int c, size_t count)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2005-10-31 06:02:13 +07:00
|
|
|
char *xs = s;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
while (count--)
|
|
|
|
*xs++ = c;
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memset);
|
|
|
|
#endif
|
|
|
|
|
2014-08-27 10:16:35 +07:00
|
|
|
/**
|
|
|
|
* memzero_explicit - Fill a region of memory (e.g. sensitive
|
|
|
|
* keying data) with 0s.
|
|
|
|
* @s: Pointer to the start of the area.
|
|
|
|
* @count: The size of the area.
|
|
|
|
*
|
2015-01-06 06:27:45 +07:00
|
|
|
* Note: usually using memset() is just fine (!), but in cases
|
|
|
|
* where clearing out _local_ data at the end of a scope is
|
|
|
|
* necessary, memzero_explicit() should be used instead in
|
|
|
|
* order to prevent the compiler from optimising away zeroing.
|
|
|
|
*
|
2014-08-27 10:16:35 +07:00
|
|
|
* memzero_explicit() doesn't need an arch-specific version as
|
|
|
|
* it just invokes the one of memset() implicitly.
|
|
|
|
*/
|
|
|
|
void memzero_explicit(void *s, size_t count)
|
|
|
|
{
|
|
|
|
memset(s, 0, count);
|
lib: make memzero_explicit more robust against dead store elimination
In commit 0b053c951829 ("lib: memzero_explicit: use barrier instead
of OPTIMIZER_HIDE_VAR"), we made memzero_explicit() more robust in
case LTO would decide to inline memzero_explicit() and eventually
find out it could be elimiated as dead store.
While using barrier() works well for the case of gcc, recent efforts
from LLVMLinux people suggest to use llvm as an alternative to gcc,
and there, Stephan found in a simple stand-alone user space example
that llvm could nevertheless optimize and thus elimitate the memset().
A similar issue has been observed in the referenced llvm bug report,
which is regarded as not-a-bug.
Based on some experiments, icc is a bit special on its own, while it
doesn't seem to eliminate the memset(), it could do so with an own
implementation, and then result in similar findings as with llvm.
The fix in this patch now works for all three compilers (also tested
with more aggressive optimization levels). Arguably, in the current
kernel tree it's more of a theoretical issue, but imho, it's better
to be pedantic about it.
It's clearly visible with gcc/llvm though, with the below code: if we
would have used barrier() only here, llvm would have omitted clearing,
not so with barrier_data() variant:
static inline void memzero_explicit(void *s, size_t count)
{
memset(s, 0, count);
barrier_data(s);
}
int main(void)
{
char buff[20];
memzero_explicit(buff, sizeof(buff));
return 0;
}
$ gcc -O2 test.c
$ gdb a.out
(gdb) disassemble main
Dump of assembler code for function main:
0x0000000000400400 <+0>: lea -0x28(%rsp),%rax
0x0000000000400405 <+5>: movq $0x0,-0x28(%rsp)
0x000000000040040e <+14>: movq $0x0,-0x20(%rsp)
0x0000000000400417 <+23>: movl $0x0,-0x18(%rsp)
0x000000000040041f <+31>: xor %eax,%eax
0x0000000000400421 <+33>: retq
End of assembler dump.
$ clang -O2 test.c
$ gdb a.out
(gdb) disassemble main
Dump of assembler code for function main:
0x00000000004004f0 <+0>: xorps %xmm0,%xmm0
0x00000000004004f3 <+3>: movaps %xmm0,-0x18(%rsp)
0x00000000004004f8 <+8>: movl $0x0,-0x8(%rsp)
0x0000000000400500 <+16>: lea -0x18(%rsp),%rax
0x0000000000400505 <+21>: xor %eax,%eax
0x0000000000400507 <+23>: retq
End of assembler dump.
As gcc, clang, but also icc defines __GNUC__, it's sufficient to define
this in compiler-gcc.h only to be picked up. For a fallback or otherwise
unsupported compiler, we define it as a barrier. Similarly, for ecc which
does not support gcc inline asm.
Reference: https://llvm.org/bugs/show_bug.cgi?id=15495
Reported-by: Stephan Mueller <smueller@chronox.de>
Tested-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Stephan Mueller <smueller@chronox.de>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: mancha security <mancha1@zoho.com>
Cc: Mark Charlebois <charlebm@gmail.com>
Cc: Behan Webster <behanw@converseincode.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2015-04-30 09:13:52 +07:00
|
|
|
barrier_data(s);
|
2014-08-27 10:16:35 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memzero_explicit);
|
|
|
|
|
2017-09-09 06:13:48 +07:00
|
|
|
#ifndef __HAVE_ARCH_MEMSET16
|
|
|
|
/**
|
|
|
|
* memset16() - Fill a memory area with a uint16_t
|
|
|
|
* @s: Pointer to the start of the area.
|
|
|
|
* @v: The value to fill the area with
|
|
|
|
* @count: The number of values to store
|
|
|
|
*
|
|
|
|
* Differs from memset() in that it fills with a uint16_t instead
|
|
|
|
* of a byte. Remember that @count is the number of uint16_ts to
|
|
|
|
* store, not the number of bytes.
|
|
|
|
*/
|
|
|
|
void *memset16(uint16_t *s, uint16_t v, size_t count)
|
|
|
|
{
|
|
|
|
uint16_t *xs = s;
|
|
|
|
|
|
|
|
while (count--)
|
|
|
|
*xs++ = v;
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memset16);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_MEMSET32
|
|
|
|
/**
|
|
|
|
* memset32() - Fill a memory area with a uint32_t
|
|
|
|
* @s: Pointer to the start of the area.
|
|
|
|
* @v: The value to fill the area with
|
|
|
|
* @count: The number of values to store
|
|
|
|
*
|
|
|
|
* Differs from memset() in that it fills with a uint32_t instead
|
|
|
|
* of a byte. Remember that @count is the number of uint32_ts to
|
|
|
|
* store, not the number of bytes.
|
|
|
|
*/
|
|
|
|
void *memset32(uint32_t *s, uint32_t v, size_t count)
|
|
|
|
{
|
|
|
|
uint32_t *xs = s;
|
|
|
|
|
|
|
|
while (count--)
|
|
|
|
*xs++ = v;
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memset32);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_MEMSET64
|
|
|
|
/**
|
|
|
|
* memset64() - Fill a memory area with a uint64_t
|
|
|
|
* @s: Pointer to the start of the area.
|
|
|
|
* @v: The value to fill the area with
|
|
|
|
* @count: The number of values to store
|
|
|
|
*
|
|
|
|
* Differs from memset() in that it fills with a uint64_t instead
|
|
|
|
* of a byte. Remember that @count is the number of uint64_ts to
|
|
|
|
* store, not the number of bytes.
|
|
|
|
*/
|
|
|
|
void *memset64(uint64_t *s, uint64_t v, size_t count)
|
|
|
|
{
|
|
|
|
uint64_t *xs = s;
|
|
|
|
|
|
|
|
while (count--)
|
|
|
|
*xs++ = v;
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memset64);
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
#ifndef __HAVE_ARCH_MEMCPY
|
|
|
|
/**
|
|
|
|
* memcpy - Copy one area of memory to another
|
|
|
|
* @dest: Where to copy to
|
|
|
|
* @src: Where to copy from
|
|
|
|
* @count: The size of the area.
|
|
|
|
*
|
|
|
|
* You should not use this function to access IO space, use memcpy_toio()
|
|
|
|
* or memcpy_fromio() instead.
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
void *memcpy(void *dest, const void *src, size_t count)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2005-10-31 06:02:13 +07:00
|
|
|
char *tmp = dest;
|
2006-04-11 12:54:09 +07:00
|
|
|
const char *s = src;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
while (count--)
|
|
|
|
*tmp++ = *s++;
|
|
|
|
return dest;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memcpy);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_MEMMOVE
|
|
|
|
/**
|
|
|
|
* memmove - Copy one area of memory to another
|
|
|
|
* @dest: Where to copy to
|
|
|
|
* @src: Where to copy from
|
|
|
|
* @count: The size of the area.
|
|
|
|
*
|
|
|
|
* Unlike memcpy(), memmove() copes with overlapping areas.
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
void *memmove(void *dest, const void *src, size_t count)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2005-10-31 06:03:19 +07:00
|
|
|
char *tmp;
|
|
|
|
const char *s;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (dest <= src) {
|
2005-10-31 06:02:13 +07:00
|
|
|
tmp = dest;
|
|
|
|
s = src;
|
2005-04-17 05:20:36 +07:00
|
|
|
while (count--)
|
|
|
|
*tmp++ = *s++;
|
2005-10-31 06:02:11 +07:00
|
|
|
} else {
|
2005-10-31 06:02:13 +07:00
|
|
|
tmp = dest;
|
|
|
|
tmp += count;
|
|
|
|
s = src;
|
|
|
|
s += count;
|
2005-04-17 05:20:36 +07:00
|
|
|
while (count--)
|
|
|
|
*--tmp = *--s;
|
2005-10-31 06:02:11 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
return dest;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memmove);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_MEMCMP
|
|
|
|
/**
|
|
|
|
* memcmp - Compare two areas of memory
|
|
|
|
* @cs: One area of memory
|
|
|
|
* @ct: Another area of memory
|
|
|
|
* @count: The size of the area.
|
|
|
|
*/
|
2005-05-06 06:15:17 +07:00
|
|
|
#undef memcmp
|
2014-02-08 14:52:06 +07:00
|
|
|
__visible int memcmp(const void *cs, const void *ct, size_t count)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
const unsigned char *su1, *su2;
|
|
|
|
int res = 0;
|
|
|
|
|
2005-10-31 06:02:11 +07:00
|
|
|
for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
|
2005-04-17 05:20:36 +07:00
|
|
|
if ((res = *su1 - *su2) != 0)
|
|
|
|
break;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memcmp);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_MEMSCAN
|
|
|
|
/**
|
|
|
|
* memscan - Find a character in an area of memory.
|
|
|
|
* @addr: The memory area
|
|
|
|
* @c: The byte to search for
|
|
|
|
* @size: The size of the area.
|
|
|
|
*
|
|
|
|
* returns the address of the first occurrence of @c, or 1 byte past
|
|
|
|
* the area if @c is not found
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
void *memscan(void *addr, int c, size_t size)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2005-10-31 06:02:13 +07:00
|
|
|
unsigned char *p = addr;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
while (size) {
|
|
|
|
if (*p == c)
|
2005-10-31 06:02:11 +07:00
|
|
|
return (void *)p;
|
2005-04-17 05:20:36 +07:00
|
|
|
p++;
|
|
|
|
size--;
|
|
|
|
}
|
2005-10-31 06:02:11 +07:00
|
|
|
return (void *)p;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memscan);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __HAVE_ARCH_STRSTR
|
|
|
|
/**
|
|
|
|
* strstr - Find the first substring in a %NUL terminated string
|
|
|
|
* @s1: The string to be searched
|
|
|
|
* @s2: The string to search for
|
|
|
|
*/
|
2005-10-31 06:02:11 +07:00
|
|
|
char *strstr(const char *s1, const char *s2)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-01-14 09:53:55 +07:00
|
|
|
size_t l1, l2;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
l2 = strlen(s2);
|
|
|
|
if (!l2)
|
2005-10-31 06:02:11 +07:00
|
|
|
return (char *)s1;
|
2005-04-17 05:20:36 +07:00
|
|
|
l1 = strlen(s1);
|
|
|
|
while (l1 >= l2) {
|
|
|
|
l1--;
|
2005-10-31 06:02:11 +07:00
|
|
|
if (!memcmp(s1, s2, l2))
|
|
|
|
return (char *)s1;
|
2005-04-17 05:20:36 +07:00
|
|
|
s1++;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strstr);
|
|
|
|
#endif
|
|
|
|
|
2010-01-14 09:53:55 +07:00
|
|
|
#ifndef __HAVE_ARCH_STRNSTR
|
|
|
|
/**
|
|
|
|
* strnstr - Find the first substring in a length-limited string
|
|
|
|
* @s1: The string to be searched
|
|
|
|
* @s2: The string to search for
|
|
|
|
* @len: the maximum number of characters to search
|
|
|
|
*/
|
|
|
|
char *strnstr(const char *s1, const char *s2, size_t len)
|
|
|
|
{
|
2010-03-06 04:43:12 +07:00
|
|
|
size_t l2;
|
2010-01-14 09:53:55 +07:00
|
|
|
|
|
|
|
l2 = strlen(s2);
|
|
|
|
if (!l2)
|
|
|
|
return (char *)s1;
|
2010-03-06 04:43:12 +07:00
|
|
|
while (len >= l2) {
|
|
|
|
len--;
|
2010-01-14 09:53:55 +07:00
|
|
|
if (!memcmp(s1, s2, l2))
|
|
|
|
return (char *)s1;
|
|
|
|
s1++;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strnstr);
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
#ifndef __HAVE_ARCH_MEMCHR
|
|
|
|
/**
|
|
|
|
* memchr - Find a character in an area of memory.
|
|
|
|
* @s: The memory area
|
|
|
|
* @c: The byte to search for
|
|
|
|
* @n: The size of the area.
|
|
|
|
*
|
|
|
|
* returns the address of the first occurrence of @c, or %NULL
|
|
|
|
* if @c is not found
|
|
|
|
*/
|
|
|
|
void *memchr(const void *s, int c, size_t n)
|
|
|
|
{
|
|
|
|
const unsigned char *p = s;
|
|
|
|
while (n-- != 0) {
|
|
|
|
if ((unsigned char)c == *p++) {
|
2005-10-31 06:02:11 +07:00
|
|
|
return (void *)(p - 1);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memchr);
|
|
|
|
#endif
|
2011-11-01 07:08:07 +07:00
|
|
|
|
|
|
|
static void *check_bytes8(const u8 *start, u8 value, unsigned int bytes)
|
|
|
|
{
|
|
|
|
while (bytes) {
|
|
|
|
if (*start != value)
|
|
|
|
return (void *)start;
|
|
|
|
start++;
|
|
|
|
bytes--;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* memchr_inv - Find an unmatching character in an area of memory.
|
|
|
|
* @start: The memory area
|
|
|
|
* @c: Find a character other than c
|
|
|
|
* @bytes: The size of the area.
|
|
|
|
*
|
|
|
|
* returns the address of the first character other than @c, or %NULL
|
|
|
|
* if the whole buffer contains just @c.
|
|
|
|
*/
|
|
|
|
void *memchr_inv(const void *start, int c, size_t bytes)
|
|
|
|
{
|
|
|
|
u8 value = c;
|
|
|
|
u64 value64;
|
|
|
|
unsigned int words, prefix;
|
|
|
|
|
|
|
|
if (bytes <= 16)
|
|
|
|
return check_bytes8(start, value, bytes);
|
|
|
|
|
2012-03-24 05:02:14 +07:00
|
|
|
value64 = value;
|
2014-09-14 01:14:53 +07:00
|
|
|
#if defined(CONFIG_ARCH_HAS_FAST_MULTIPLIER) && BITS_PER_LONG == 64
|
2015-11-11 05:45:14 +07:00
|
|
|
value64 *= 0x0101010101010101ULL;
|
2014-09-14 01:14:53 +07:00
|
|
|
#elif defined(CONFIG_ARCH_HAS_FAST_MULTIPLIER)
|
2012-03-24 05:02:14 +07:00
|
|
|
value64 *= 0x01010101;
|
|
|
|
value64 |= value64 << 32;
|
|
|
|
#else
|
|
|
|
value64 |= value64 << 8;
|
|
|
|
value64 |= value64 << 16;
|
|
|
|
value64 |= value64 << 32;
|
|
|
|
#endif
|
2011-11-01 07:08:07 +07:00
|
|
|
|
2012-03-24 05:02:14 +07:00
|
|
|
prefix = (unsigned long)start % 8;
|
2011-11-01 07:08:07 +07:00
|
|
|
if (prefix) {
|
2012-03-24 05:02:14 +07:00
|
|
|
u8 *r;
|
|
|
|
|
|
|
|
prefix = 8 - prefix;
|
|
|
|
r = check_bytes8(start, value, prefix);
|
2011-11-01 07:08:07 +07:00
|
|
|
if (r)
|
|
|
|
return r;
|
|
|
|
start += prefix;
|
|
|
|
bytes -= prefix;
|
|
|
|
}
|
|
|
|
|
|
|
|
words = bytes / 8;
|
|
|
|
|
|
|
|
while (words) {
|
|
|
|
if (*(u64 *)start != value64)
|
|
|
|
return check_bytes8(start, value, 8);
|
|
|
|
start += 8;
|
|
|
|
words--;
|
|
|
|
}
|
|
|
|
|
|
|
|
return check_bytes8(start, value, bytes % 8);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(memchr_inv);
|
2015-06-26 05:02:22 +07:00
|
|
|
|
|
|
|
/**
|
|
|
|
* strreplace - Replace all occurrences of character in string.
|
|
|
|
* @s: The string to operate on.
|
|
|
|
* @old: The character being replaced.
|
|
|
|
* @new: The character @old is replaced with.
|
|
|
|
*
|
|
|
|
* Returns pointer to the nul byte at the end of @s.
|
|
|
|
*/
|
|
|
|
char *strreplace(char *s, char old, char new)
|
|
|
|
{
|
|
|
|
for (; *s; ++s)
|
|
|
|
if (*s == old)
|
|
|
|
*s = new;
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(strreplace);
|
include/linux/string.h: add the option of fortified string.h functions
This adds support for compiling with a rough equivalent to the glibc
_FORTIFY_SOURCE=1 feature, providing compile-time and runtime buffer
overflow checks for string.h functions when the compiler determines the
size of the source or destination buffer at compile-time. Unlike glibc,
it covers buffer reads in addition to writes.
GNU C __builtin_*_chk intrinsics are avoided because they would force a
much more complex implementation. They aren't designed to detect read
overflows and offer no real benefit when using an implementation based
on inline checks. Inline checks don't add up to much code size and
allow full use of the regular string intrinsics while avoiding the need
for a bunch of _chk functions and per-arch assembly to avoid wrapper
overhead.
This detects various overflows at compile-time in various drivers and
some non-x86 core kernel code. There will likely be issues caught in
regular use at runtime too.
Future improvements left out of initial implementation for simplicity,
as it's all quite optional and can be done incrementally:
* Some of the fortified string functions (strncpy, strcat), don't yet
place a limit on reads from the source based on __builtin_object_size of
the source buffer.
* Extending coverage to more string functions like strlcat.
* It should be possible to optionally use __builtin_object_size(x, 1) for
some functions (C strings) to detect intra-object overflows (like
glibc's _FORTIFY_SOURCE=2), but for now this takes the conservative
approach to avoid likely compatibility issues.
* The compile-time checks should be made available via a separate config
option which can be enabled by default (or always enabled) once enough
time has passed to get the issues it catches fixed.
Kees said:
"This is great to have. While it was out-of-tree code, it would have
blocked at least CVE-2016-3858 from being exploitable (improper size
argument to strlcpy()). I've sent a number of fixes for
out-of-bounds-reads that this detected upstream already"
[arnd@arndb.de: x86: fix fortified memcpy]
Link: http://lkml.kernel.org/r/20170627150047.660360-1-arnd@arndb.de
[keescook@chromium.org: avoid panic() in favor of BUG()]
Link: http://lkml.kernel.org/r/20170626235122.GA25261@beast
[keescook@chromium.org: move from -mm, add ARCH_HAS_FORTIFY_SOURCE, tweak Kconfig help]
Link: http://lkml.kernel.org/r/20170526095404.20439-1-danielmicay@gmail.com
Link: http://lkml.kernel.org/r/1497903987-21002-8-git-send-email-keescook@chromium.org
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Daniel Axtens <dja@axtens.net>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-07-13 04:36:10 +07:00
|
|
|
|
|
|
|
void fortify_panic(const char *name)
|
|
|
|
{
|
|
|
|
pr_emerg("detected buffer overflow in %s\n", name);
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(fortify_panic);
|
2017-09-09 06:13:52 +07:00
|
|
|
|
|
|
|
#ifdef CONFIG_STRING_SELFTEST
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
|
|
|
static __init int memset16_selftest(void)
|
|
|
|
{
|
|
|
|
unsigned i, j, k;
|
2017-09-09 06:15:48 +07:00
|
|
|
u16 v, *p;
|
|
|
|
|
|
|
|
p = kmalloc(256 * 2 * 2, GFP_KERNEL);
|
|
|
|
if (!p)
|
|
|
|
return -1;
|
2017-09-09 06:13:52 +07:00
|
|
|
|
|
|
|
for (i = 0; i < 256; i++) {
|
|
|
|
for (j = 0; j < 256; j++) {
|
|
|
|
memset(p, 0xa1, 256 * 2 * sizeof(v));
|
|
|
|
memset16(p + i, 0xb1b2, j);
|
|
|
|
for (k = 0; k < 512; k++) {
|
|
|
|
v = p[k];
|
|
|
|
if (k < i) {
|
|
|
|
if (v != 0xa1a1)
|
|
|
|
goto fail;
|
|
|
|
} else if (k < i + j) {
|
|
|
|
if (v != 0xb1b2)
|
|
|
|
goto fail;
|
|
|
|
} else {
|
|
|
|
if (v != 0xa1a1)
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
|
|
|
kfree(p);
|
|
|
|
if (i < 256)
|
|
|
|
return (i << 24) | (j << 16) | k;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __init int memset32_selftest(void)
|
|
|
|
{
|
|
|
|
unsigned i, j, k;
|
2017-09-09 06:15:48 +07:00
|
|
|
u32 v, *p;
|
|
|
|
|
|
|
|
p = kmalloc(256 * 2 * 4, GFP_KERNEL);
|
|
|
|
if (!p)
|
|
|
|
return -1;
|
2017-09-09 06:13:52 +07:00
|
|
|
|
|
|
|
for (i = 0; i < 256; i++) {
|
|
|
|
for (j = 0; j < 256; j++) {
|
|
|
|
memset(p, 0xa1, 256 * 2 * sizeof(v));
|
|
|
|
memset32(p + i, 0xb1b2b3b4, j);
|
|
|
|
for (k = 0; k < 512; k++) {
|
|
|
|
v = p[k];
|
|
|
|
if (k < i) {
|
|
|
|
if (v != 0xa1a1a1a1)
|
|
|
|
goto fail;
|
|
|
|
} else if (k < i + j) {
|
|
|
|
if (v != 0xb1b2b3b4)
|
|
|
|
goto fail;
|
|
|
|
} else {
|
|
|
|
if (v != 0xa1a1a1a1)
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
|
|
|
kfree(p);
|
|
|
|
if (i < 256)
|
|
|
|
return (i << 24) | (j << 16) | k;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __init int memset64_selftest(void)
|
|
|
|
{
|
|
|
|
unsigned i, j, k;
|
2017-09-09 06:15:48 +07:00
|
|
|
u64 v, *p;
|
|
|
|
|
|
|
|
p = kmalloc(256 * 2 * 8, GFP_KERNEL);
|
|
|
|
if (!p)
|
|
|
|
return -1;
|
2017-09-09 06:13:52 +07:00
|
|
|
|
|
|
|
for (i = 0; i < 256; i++) {
|
|
|
|
for (j = 0; j < 256; j++) {
|
|
|
|
memset(p, 0xa1, 256 * 2 * sizeof(v));
|
|
|
|
memset64(p + i, 0xb1b2b3b4b5b6b7b8ULL, j);
|
|
|
|
for (k = 0; k < 512; k++) {
|
|
|
|
v = p[k];
|
|
|
|
if (k < i) {
|
|
|
|
if (v != 0xa1a1a1a1a1a1a1a1ULL)
|
|
|
|
goto fail;
|
|
|
|
} else if (k < i + j) {
|
|
|
|
if (v != 0xb1b2b3b4b5b6b7b8ULL)
|
|
|
|
goto fail;
|
|
|
|
} else {
|
|
|
|
if (v != 0xa1a1a1a1a1a1a1a1ULL)
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
|
|
|
kfree(p);
|
|
|
|
if (i < 256)
|
|
|
|
return (i << 24) | (j << 16) | k;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __init int string_selftest_init(void)
|
|
|
|
{
|
|
|
|
int test, subtest;
|
|
|
|
|
|
|
|
test = 1;
|
|
|
|
subtest = memset16_selftest();
|
|
|
|
if (subtest)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
test = 2;
|
|
|
|
subtest = memset32_selftest();
|
|
|
|
if (subtest)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
test = 3;
|
|
|
|
subtest = memset64_selftest();
|
|
|
|
if (subtest)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
pr_info("String selftests succeeded\n");
|
|
|
|
return 0;
|
|
|
|
fail:
|
|
|
|
pr_crit("String selftest failure %d.%08x\n", test, subtest);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(string_selftest_init);
|
|
|
|
#endif /* CONFIG_STRING_SELFTEST */
|