mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
ea3723a541
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>
102 lines
2.1 KiB
C
102 lines
2.1 KiB
C
// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
|
|
/*
|
|
* libfdt - Flat Device Tree manipulation
|
|
* Copyright (C) 2014 David Gibson <david@gibson.dropbear.id.au>
|
|
* Copyright (C) 2018 embedded brains GmbH
|
|
*/
|
|
#include "libfdt_env.h"
|
|
|
|
#include <fdt.h>
|
|
#include <libfdt.h>
|
|
|
|
#include "libfdt_internal.h"
|
|
|
|
static int fdt_cells(const void *fdt, int nodeoffset, const char *name)
|
|
{
|
|
const fdt32_t *c;
|
|
uint32_t val;
|
|
int len;
|
|
|
|
c = fdt_getprop(fdt, nodeoffset, name, &len);
|
|
if (!c)
|
|
return len;
|
|
|
|
if (len != sizeof(*c))
|
|
return -FDT_ERR_BADNCELLS;
|
|
|
|
val = fdt32_to_cpu(*c);
|
|
if (val > FDT_MAX_NCELLS)
|
|
return -FDT_ERR_BADNCELLS;
|
|
|
|
return (int)val;
|
|
}
|
|
|
|
int fdt_address_cells(const void *fdt, int nodeoffset)
|
|
{
|
|
int val;
|
|
|
|
val = fdt_cells(fdt, nodeoffset, "#address-cells");
|
|
if (val == 0)
|
|
return -FDT_ERR_BADNCELLS;
|
|
if (val == -FDT_ERR_NOTFOUND)
|
|
return 2;
|
|
return val;
|
|
}
|
|
|
|
int fdt_size_cells(const void *fdt, int nodeoffset)
|
|
{
|
|
int val;
|
|
|
|
val = fdt_cells(fdt, nodeoffset, "#size-cells");
|
|
if (val == -FDT_ERR_NOTFOUND)
|
|
return 1;
|
|
return val;
|
|
}
|
|
|
|
/* This function assumes that [address|size]_cells is 1 or 2 */
|
|
int fdt_appendprop_addrrange(void *fdt, int parent, int nodeoffset,
|
|
const char *name, uint64_t addr, uint64_t size)
|
|
{
|
|
int addr_cells, size_cells, ret;
|
|
uint8_t data[sizeof(fdt64_t) * 2], *prop;
|
|
|
|
ret = fdt_address_cells(fdt, parent);
|
|
if (ret < 0)
|
|
return ret;
|
|
addr_cells = ret;
|
|
|
|
ret = fdt_size_cells(fdt, parent);
|
|
if (ret < 0)
|
|
return ret;
|
|
size_cells = ret;
|
|
|
|
/* check validity of address */
|
|
prop = data;
|
|
if (addr_cells == 1) {
|
|
if ((addr > UINT32_MAX) || (((uint64_t) UINT32_MAX + 1 - addr) < size))
|
|
return -FDT_ERR_BADVALUE;
|
|
|
|
fdt32_st(prop, (uint32_t)addr);
|
|
} else if (addr_cells == 2) {
|
|
fdt64_st(prop, addr);
|
|
} else {
|
|
return -FDT_ERR_BADNCELLS;
|
|
}
|
|
|
|
/* check validity of size */
|
|
prop += addr_cells * sizeof(fdt32_t);
|
|
if (size_cells == 1) {
|
|
if (size > UINT32_MAX)
|
|
return -FDT_ERR_BADVALUE;
|
|
|
|
fdt32_st(prop, (uint32_t)size);
|
|
} else if (size_cells == 2) {
|
|
fdt64_st(prop, size);
|
|
} else {
|
|
return -FDT_ERR_BADNCELLS;
|
|
}
|
|
|
|
return fdt_appendprop(fdt, nodeoffset, name, data,
|
|
(addr_cells + size_cells) * sizeof(fdt32_t));
|
|
}
|