mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
![Rob Herring](/assets/img/avatar_default.png)
It's been a while since the last sync and Lee needs commit 73590342fc85 ("libfdt: prevent integer overflow in fdt_next_tag"). This adds the following commits from upstream: 55778a03df61 libfdt: tests: add get_next_tag_invalid_prop_len 73590342fc85 libfdt: prevent integer overflow in fdt_next_tag 035fb90d5375 libfdt: add fdt_get_property_by_offset_w helper 98a07006c48d Makefile: fix infinite recursion by dropping non-existent `%.output` a036cc7b0c10 Makefile: limit make re-execution to avoid infinite spin c6e92108bcd9 libdtc: remove duplicate judgments e37c25677dc9 Don't generate erroneous fixups from reference to path 50454658f2b5 libfdt: Don't mask fdt_get_name() returned error e64a204196c9 manual.txt: Follow README.md and remove Jon f508c83fe6f0 Update README in MANIFEST.in and setup.py to README.md c2ccf8a77dd2 Add description of Signed-off-by lines 90b9d9de42ca Split out information for contributors to CONTRIBUTING.md 0ee1d479b23a Remove Jon Loeliger from maintainers list b33a73c62c1c Convert README to README.md 7ad60734b1c1 Allow static building with meson fd9b8c96c780 Allow static building with make fda71da26e7f libfdt: Handle failed get_name() on BEGIN_NODE c7c7f17a83d5 Fix test script to run also on dash shell 01f23ffe1679 Add missing relref_merge test to meson test list ed310803ea89 pylibfdt: add FdtRo.get_path() c001fc01a43e pylibfdt: fix swig build in install 26c54f840d23 tests: add test cases for label-relative path references ec7986e682cf dtc: introduce label relative path references 651410e54cb9 util: introduce xstrndup helper 4048aed12b81 setup.py: fix out of tree build ff5afb96d0c0 Handle integer overflow in check_property_phandle_args() ca7294434309 README: Explain how to add a new API function c0c2e115f82e Fix a UB when fdt_get_string return null cd5f69cbc0d4 tests: setprop_inplace: use xstrdup instead of unchecked strdup a04f69025003 pylibfdt: add Property.as_*int*_array() 83102717d7c4 pylibfdt: add Property.as_stringlist() d152126bb029 Fix Python crash on getprop deallocation 17739b7ef510 Support 'r' format for printing raw bytes with fdtget 45f3d1a095dd libfdt: overlay: make overlay_get_target() public c19a4bafa514 libfdt: fix an incorrect integer promotion 1cc41b1c969f pylibfdt: Add packaging metadata db72398cd437 README: Update pylibfdt install instructions 383e148b70a4 pylibfdt: fix with Python 3.10 23b56cb7e189 pylibfdt: Move setup.py to the top level 69a760747d8d pylibfdt: Split setup.py author name and email 0b106a77dbdc pylibfdt: Use setuptools_scm for the version c691776ddb26 pylibfdt: Use setuptools instead of distutils 5216f3f1bbb7 libfdt: Add static lib to meson build 4eda2590f481 CI: Cirrus: bump used FreeBSD from 12.1 to 13.0 Link: https://lore.kernel.org/r/20221101181427.1808703-1-robh@kernel.org/ Signed-off-by: Rob Herring <robh@kernel.org>
479 lines
8.7 KiB
C
479 lines
8.7 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright 2011 The Chromium Authors, All Rights Reserved.
|
|
* Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
|
|
*
|
|
* util_is_printable_string contributed by
|
|
* Pantelis Antoniou <pantelis.antoniou AT gmail.com>
|
|
*/
|
|
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
#include <inttypes.h>
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
|
|
#include "libfdt.h"
|
|
#include "util.h"
|
|
#include "version_gen.h"
|
|
|
|
char *xstrdup(const char *s)
|
|
{
|
|
int len = strlen(s) + 1;
|
|
char *d = xmalloc(len);
|
|
|
|
memcpy(d, s, len);
|
|
|
|
return d;
|
|
}
|
|
|
|
char *xstrndup(const char *s, size_t n)
|
|
{
|
|
size_t len = strnlen(s, n) + 1;
|
|
char *d = xmalloc(len);
|
|
|
|
memcpy(d, s, len - 1);
|
|
d[len - 1] = '\0';
|
|
|
|
return d;
|
|
}
|
|
|
|
int xavsprintf_append(char **strp, const char *fmt, va_list ap)
|
|
{
|
|
int n, size = 0; /* start with 128 bytes */
|
|
char *p;
|
|
va_list ap_copy;
|
|
|
|
p = *strp;
|
|
if (p)
|
|
size = strlen(p);
|
|
|
|
va_copy(ap_copy, ap);
|
|
n = vsnprintf(NULL, 0, fmt, ap_copy) + 1;
|
|
va_end(ap_copy);
|
|
|
|
p = xrealloc(p, size + n);
|
|
|
|
n = vsnprintf(p + size, n, fmt, ap);
|
|
|
|
*strp = p;
|
|
return strlen(p);
|
|
}
|
|
|
|
int xasprintf_append(char **strp, const char *fmt, ...)
|
|
{
|
|
int n;
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
n = xavsprintf_append(strp, fmt, ap);
|
|
va_end(ap);
|
|
|
|
return n;
|
|
}
|
|
|
|
int xasprintf(char **strp, const char *fmt, ...)
|
|
{
|
|
int n;
|
|
va_list ap;
|
|
|
|
*strp = NULL;
|
|
|
|
va_start(ap, fmt);
|
|
n = xavsprintf_append(strp, fmt, ap);
|
|
va_end(ap);
|
|
|
|
return n;
|
|
}
|
|
|
|
char *join_path(const char *path, const char *name)
|
|
{
|
|
int lenp = strlen(path);
|
|
int lenn = strlen(name);
|
|
int len;
|
|
int needslash = 1;
|
|
char *str;
|
|
|
|
len = lenp + lenn + 2;
|
|
if ((lenp > 0) && (path[lenp-1] == '/')) {
|
|
needslash = 0;
|
|
len--;
|
|
}
|
|
|
|
str = xmalloc(len);
|
|
memcpy(str, path, lenp);
|
|
if (needslash) {
|
|
str[lenp] = '/';
|
|
lenp++;
|
|
}
|
|
memcpy(str+lenp, name, lenn+1);
|
|
return str;
|
|
}
|
|
|
|
bool util_is_printable_string(const void *data, int len)
|
|
{
|
|
const char *s = data;
|
|
const char *ss, *se;
|
|
|
|
/* zero length is not */
|
|
if (len == 0)
|
|
return 0;
|
|
|
|
/* must terminate with zero */
|
|
if (s[len - 1] != '\0')
|
|
return 0;
|
|
|
|
se = s + len;
|
|
|
|
while (s < se) {
|
|
ss = s;
|
|
while (s < se && *s && isprint((unsigned char)*s))
|
|
s++;
|
|
|
|
/* not zero, or not done yet */
|
|
if (*s != '\0' || s == ss)
|
|
return 0;
|
|
|
|
s++;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Parse a octal encoded character starting at index i in string s. The
|
|
* resulting character will be returned and the index i will be updated to
|
|
* point at the character directly after the end of the encoding, this may be
|
|
* the '\0' terminator of the string.
|
|
*/
|
|
static char get_oct_char(const char *s, int *i)
|
|
{
|
|
char x[4];
|
|
char *endx;
|
|
long val;
|
|
|
|
x[3] = '\0';
|
|
strncpy(x, s + *i, 3);
|
|
|
|
val = strtol(x, &endx, 8);
|
|
|
|
assert(endx > x);
|
|
|
|
(*i) += endx - x;
|
|
return val;
|
|
}
|
|
|
|
/*
|
|
* Parse a hexadecimal encoded character starting at index i in string s. The
|
|
* resulting character will be returned and the index i will be updated to
|
|
* point at the character directly after the end of the encoding, this may be
|
|
* the '\0' terminator of the string.
|
|
*/
|
|
static char get_hex_char(const char *s, int *i)
|
|
{
|
|
char x[3];
|
|
char *endx;
|
|
long val;
|
|
|
|
x[2] = '\0';
|
|
strncpy(x, s + *i, 2);
|
|
|
|
val = strtol(x, &endx, 16);
|
|
if (!(endx > x))
|
|
die("\\x used with no following hex digits\n");
|
|
|
|
(*i) += endx - x;
|
|
return val;
|
|
}
|
|
|
|
char get_escape_char(const char *s, int *i)
|
|
{
|
|
char c = s[*i];
|
|
int j = *i + 1;
|
|
char val;
|
|
|
|
switch (c) {
|
|
case 'a':
|
|
val = '\a';
|
|
break;
|
|
case 'b':
|
|
val = '\b';
|
|
break;
|
|
case 't':
|
|
val = '\t';
|
|
break;
|
|
case 'n':
|
|
val = '\n';
|
|
break;
|
|
case 'v':
|
|
val = '\v';
|
|
break;
|
|
case 'f':
|
|
val = '\f';
|
|
break;
|
|
case 'r':
|
|
val = '\r';
|
|
break;
|
|
case '0':
|
|
case '1':
|
|
case '2':
|
|
case '3':
|
|
case '4':
|
|
case '5':
|
|
case '6':
|
|
case '7':
|
|
j--; /* need to re-read the first digit as
|
|
* part of the octal value */
|
|
val = get_oct_char(s, &j);
|
|
break;
|
|
case 'x':
|
|
val = get_hex_char(s, &j);
|
|
break;
|
|
default:
|
|
val = c;
|
|
}
|
|
|
|
(*i) = j;
|
|
return val;
|
|
}
|
|
|
|
int utilfdt_read_err(const char *filename, char **buffp, size_t *len)
|
|
{
|
|
int fd = 0; /* assume stdin */
|
|
char *buf = NULL;
|
|
size_t bufsize = 1024, offset = 0;
|
|
int ret = 0;
|
|
|
|
*buffp = NULL;
|
|
if (strcmp(filename, "-") != 0) {
|
|
fd = open(filename, O_RDONLY);
|
|
if (fd < 0)
|
|
return errno;
|
|
}
|
|
|
|
/* Loop until we have read everything */
|
|
buf = xmalloc(bufsize);
|
|
do {
|
|
/* Expand the buffer to hold the next chunk */
|
|
if (offset == bufsize) {
|
|
bufsize *= 2;
|
|
buf = xrealloc(buf, bufsize);
|
|
}
|
|
|
|
ret = read(fd, &buf[offset], bufsize - offset);
|
|
if (ret < 0) {
|
|
ret = errno;
|
|
break;
|
|
}
|
|
offset += ret;
|
|
} while (ret != 0);
|
|
|
|
/* Clean up, including closing stdin; return errno on error */
|
|
close(fd);
|
|
if (ret)
|
|
free(buf);
|
|
else
|
|
*buffp = buf;
|
|
if (len)
|
|
*len = bufsize;
|
|
return ret;
|
|
}
|
|
|
|
char *utilfdt_read(const char *filename, size_t *len)
|
|
{
|
|
char *buff;
|
|
int ret = utilfdt_read_err(filename, &buff, len);
|
|
|
|
if (ret) {
|
|
fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename,
|
|
strerror(ret));
|
|
return NULL;
|
|
}
|
|
/* Successful read */
|
|
return buff;
|
|
}
|
|
|
|
int utilfdt_write_err(const char *filename, const void *blob)
|
|
{
|
|
int fd = 1; /* assume stdout */
|
|
int totalsize;
|
|
int offset;
|
|
int ret = 0;
|
|
const char *ptr = blob;
|
|
|
|
if (strcmp(filename, "-") != 0) {
|
|
fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
|
|
if (fd < 0)
|
|
return errno;
|
|
}
|
|
|
|
totalsize = fdt_totalsize(blob);
|
|
offset = 0;
|
|
|
|
while (offset < totalsize) {
|
|
ret = write(fd, ptr + offset, totalsize - offset);
|
|
if (ret < 0) {
|
|
ret = -errno;
|
|
break;
|
|
}
|
|
offset += ret;
|
|
}
|
|
/* Close the file/stdin; return errno on error */
|
|
if (fd != 1)
|
|
close(fd);
|
|
return ret < 0 ? -ret : 0;
|
|
}
|
|
|
|
|
|
int utilfdt_write(const char *filename, const void *blob)
|
|
{
|
|
int ret = utilfdt_write_err(filename, blob);
|
|
|
|
if (ret) {
|
|
fprintf(stderr, "Couldn't write blob to '%s': %s\n", filename,
|
|
strerror(ret));
|
|
}
|
|
return ret ? -1 : 0;
|
|
}
|
|
|
|
int utilfdt_decode_type(const char *fmt, int *type, int *size)
|
|
{
|
|
int qualifier = 0;
|
|
|
|
if (!*fmt)
|
|
return -1;
|
|
|
|
/* get the conversion qualifier */
|
|
*size = -1;
|
|
if (strchr("hlLb", *fmt)) {
|
|
qualifier = *fmt++;
|
|
if (qualifier == *fmt) {
|
|
switch (*fmt++) {
|
|
/* TODO: case 'l': qualifier = 'L'; break;*/
|
|
case 'h':
|
|
qualifier = 'b';
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* we should now have a type */
|
|
if ((*fmt == '\0') || !strchr("iuxsr", *fmt))
|
|
return -1;
|
|
|
|
/* convert qualifier (bhL) to byte size */
|
|
if (*fmt != 's' && *fmt != 'r')
|
|
*size = qualifier == 'b' ? 1 :
|
|
qualifier == 'h' ? 2 :
|
|
qualifier == 'l' ? 4 : -1;
|
|
*type = *fmt++;
|
|
|
|
/* that should be it! */
|
|
if (*fmt)
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
void utilfdt_print_data(const char *data, int len)
|
|
{
|
|
int i;
|
|
const char *s;
|
|
|
|
/* no data, don't print */
|
|
if (len == 0)
|
|
return;
|
|
|
|
if (util_is_printable_string(data, len)) {
|
|
printf(" = ");
|
|
|
|
s = data;
|
|
do {
|
|
printf("\"%s\"", s);
|
|
s += strlen(s) + 1;
|
|
if (s < data + len)
|
|
printf(", ");
|
|
} while (s < data + len);
|
|
|
|
} else if ((len % 4) == 0) {
|
|
const fdt32_t *cell = (const fdt32_t *)data;
|
|
|
|
printf(" = <");
|
|
for (i = 0, len /= 4; i < len; i++)
|
|
printf("0x%08" PRIx32 "%s", fdt32_to_cpu(cell[i]),
|
|
i < (len - 1) ? " " : "");
|
|
printf(">");
|
|
} else {
|
|
const unsigned char *p = (const unsigned char *)data;
|
|
printf(" = [");
|
|
for (i = 0; i < len; i++)
|
|
printf("%02x%s", *p++, i < len - 1 ? " " : "");
|
|
printf("]");
|
|
}
|
|
}
|
|
|
|
void NORETURN util_version(void)
|
|
{
|
|
printf("Version: %s\n", DTC_VERSION);
|
|
exit(0);
|
|
}
|
|
|
|
void NORETURN util_usage(const char *errmsg, const char *synopsis,
|
|
const char *short_opts,
|
|
struct option const long_opts[],
|
|
const char * const opts_help[])
|
|
{
|
|
FILE *fp = errmsg ? stderr : stdout;
|
|
const char a_arg[] = "<arg>";
|
|
size_t a_arg_len = strlen(a_arg) + 1;
|
|
size_t i;
|
|
int optlen;
|
|
|
|
fprintf(fp,
|
|
"Usage: %s\n"
|
|
"\n"
|
|
"Options: -[%s]\n", synopsis, short_opts);
|
|
|
|
/* prescan the --long opt length to auto-align */
|
|
optlen = 0;
|
|
for (i = 0; long_opts[i].name; ++i) {
|
|
/* +1 is for space between --opt and help text */
|
|
int l = strlen(long_opts[i].name) + 1;
|
|
if (long_opts[i].has_arg == a_argument)
|
|
l += a_arg_len;
|
|
if (optlen < l)
|
|
optlen = l;
|
|
}
|
|
|
|
for (i = 0; long_opts[i].name; ++i) {
|
|
/* helps when adding new applets or options */
|
|
assert(opts_help[i] != NULL);
|
|
|
|
/* first output the short flag if it has one */
|
|
if (long_opts[i].val > '~')
|
|
fprintf(fp, " ");
|
|
else
|
|
fprintf(fp, " -%c, ", long_opts[i].val);
|
|
|
|
/* then the long flag */
|
|
if (long_opts[i].has_arg == no_argument)
|
|
fprintf(fp, "--%-*s", optlen, long_opts[i].name);
|
|
else
|
|
fprintf(fp, "--%s %s%*s", long_opts[i].name, a_arg,
|
|
(int)(optlen - strlen(long_opts[i].name) - a_arg_len), "");
|
|
|
|
/* finally the help text */
|
|
fprintf(fp, "%s\n", opts_help[i]);
|
|
}
|
|
|
|
if (errmsg) {
|
|
fprintf(fp, "\nError: %s\n", errmsg);
|
|
exit(EXIT_FAILURE);
|
|
} else
|
|
exit(EXIT_SUCCESS);
|
|
}
|