* [PATCH v5 11/23] bootconfig: use __packed macro for struct xbc_node
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
Replace the open-coded __attribute__((__packed__)) with the kernel
__packed macro for consistency with the rest of the kernel.
Signed-off-by: Josh Law <objecting@objecting.org>
---
include/linux/bootconfig.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h
index 25df9260d206..c37e0096c4f1 100644
--- a/include/linux/bootconfig.h
+++ b/include/linux/bootconfig.h
@@ -53,7 +53,7 @@ struct xbc_node {
uint16_t child;
uint16_t parent;
uint16_t data;
-} __attribute__ ((__packed__));
+} __packed;
#define XBC_KEY 0
#define XBC_VALUE (1 << 15)
--
2.34.1
^ permalink raw reply related
* [PATCH v5 09/23] lib/bootconfig: increment xbc_node_num after node init succeeds
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
Move the xbc_node_num increment to after xbc_init_node() so a failed
init does not leave a partially initialized node counted in the array.
If xbc_init_node() fails on a data offset at the boundary of a
maximum-size bootconfig, the pre-incremented count causes subsequent
tree verification and traversal to consider the uninitialized node as
valid, potentially leading to an out-of-bounds read or unpredictable
boot behavior.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 56fbedc9e725..06e8a79ab472 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -429,9 +429,10 @@ static struct xbc_node * __init xbc_add_node(char *data, uint16_t flag)
if (xbc_node_num == XBC_NODE_MAX)
return NULL;
- node = &xbc_nodes[xbc_node_num++];
+ node = &xbc_nodes[xbc_node_num];
if (xbc_init_node(node, data, flag) < 0)
return NULL;
+ xbc_node_num++;
return node;
}
--
2.34.1
^ permalink raw reply related
* [PATCH v5 18/23] lib/bootconfig: fix signed comparison in xbc_node_get_data()
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
lib/bootconfig.c:188:28: warning: comparison of integer expressions
of different signedness: 'int' and 'size_t' [-Wsign-compare]
The local variable 'offset' is declared as int, but xbc_data_size is
size_t. Using ~XBC_VALUE as the mask also involves integer promotion
rules that obscure intent.
Change the type to unsigned int and mask with XBC_DATA_MAX (which is
the 15-bit data mask) instead of ~XBC_VALUE, making the expression
self-documenting and eliminating the signed/unsigned comparison.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 182d9d9bc5a6..806a8f038d24 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -183,7 +183,7 @@ struct xbc_node * __init xbc_node_get_next(struct xbc_node *node)
*/
const char * __init xbc_node_get_data(struct xbc_node *node)
{
- int offset = node->data & ~XBC_VALUE;
+ unsigned int offset = node->data & XBC_DATA_MAX;
if (WARN_ON(offset >= xbc_data_size))
return NULL;
--
2.34.1
^ permalink raw reply related
* [PATCH v5 08/23] lib/bootconfig: fix off-by-one in xbc_verify_tree() next node check
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
Valid node indices are 0 to xbc_node_num-1, so a next value equal to
xbc_node_num is out of bounds. Use >= instead of > to catch this.
A malformed or corrupt bootconfig could pass tree verification with
an out-of-bounds next index. On subsequent tree traversal at boot
time, xbc_node_get_next() would return a pointer past the allocated
xbc_nodes array, causing an out-of-bounds read of kernel memory.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 58d6ae297280..56fbedc9e725 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -816,7 +816,7 @@ static int __init xbc_verify_tree(void)
}
for (i = 0; i < xbc_node_num; i++) {
- if (xbc_nodes[i].next > xbc_node_num) {
+ if (xbc_nodes[i].next >= xbc_node_num) {
return xbc_parse_error("No closing brace",
xbc_node_get_data(xbc_nodes + i));
}
--
2.34.1
^ permalink raw reply related
* [PATCH v5 19/23] lib/bootconfig: use size_t for strlen result in xbc_node_match_prefix()
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
lib/bootconfig.c:198:19: warning: conversion from 'size_t' to 'int'
may change value [-Wconversion]
lib/bootconfig.c:200:33: warning: conversion to '__kernel_size_t'
from 'int' may change the sign of the result [-Wsign-conversion]
strlen() returns size_t but the result was stored in an int. The value
is then passed back to strncmp() which expects size_t, causing a second
sign-conversion warning on the round-trip. Use size_t throughout to
match the API types.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 806a8f038d24..995c2ec94cbe 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -195,7 +195,7 @@ static bool __init
xbc_node_match_prefix(struct xbc_node *node, const char **prefix)
{
const char *p = xbc_node_get_data(node);
- int len = strlen(p);
+ size_t len = strlen(p);
if (strncmp(*prefix, p, len))
return false;
--
2.34.1
^ permalink raw reply related
* [PATCH v5 23/23] lib/bootconfig: change xbc_node_index() return type to uint16_t
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
lib/bootconfig.c:136:21: warning: conversion from 'long int' to
'int' may change value [-Wconversion]
lib/bootconfig.c:308:33: warning: conversion from 'int' to 'uint16_t'
may change value [-Wconversion]
lib/bootconfig.c:467:37: warning: conversion from 'int' to 'uint16_t'
may change value [-Wconversion]
lib/bootconfig.c:469:40: warning: conversion from 'int' to 'uint16_t'
may change value [-Wconversion]
lib/bootconfig.c:472:54: warning: conversion from 'int' to 'uint16_t'
may change value [-Wconversion]
lib/bootconfig.c:476:45: warning: conversion from 'int' to 'uint16_t'
may change value [-Wconversion]
xbc_node_index() returns the position of a node in the xbc_nodes array,
which has at most XBC_NODE_MAX (8192) entries, well within uint16_t
range. Every caller stores the result in a uint16_t field (node->parent,
node->child, node->next, or the keys[] array in compose_key_after), so
the int return type causes narrowing warnings at all six call sites.
Change the return type to uint16_t and add an explicit cast on the
pointer subtraction to match the storage width and eliminate the
warnings.
Signed-off-by: Josh Law <objecting@objecting.org>
---
include/linux/bootconfig.h | 2 +-
lib/bootconfig.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h
index d78c2b62debf..e5bd46ca7a51 100644
--- a/include/linux/bootconfig.h
+++ b/include/linux/bootconfig.h
@@ -66,7 +66,7 @@ struct xbc_node {
/* Node tree access raw APIs */
struct xbc_node * __init xbc_root_node(void);
-int __init xbc_node_index(struct xbc_node *node);
+uint16_t __init xbc_node_index(struct xbc_node *node);
struct xbc_node * __init xbc_node_get_parent(struct xbc_node *node);
struct xbc_node * __init xbc_node_get_child(struct xbc_node *node);
struct xbc_node * __init xbc_node_get_next(struct xbc_node *node);
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 68a72dbc38fa..148084abae12 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -131,9 +131,9 @@ struct xbc_node * __init xbc_root_node(void)
*
* Return the index number of @node in XBC node list.
*/
-int __init xbc_node_index(struct xbc_node *node)
+uint16_t __init xbc_node_index(struct xbc_node *node)
{
- return node - &xbc_nodes[0];
+ return (uint16_t)(node - &xbc_nodes[0]);
}
/**
--
2.34.1
^ permalink raw reply related
* [PATCH v5 20/23] lib/bootconfig: narrow offset type in xbc_init_node()
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
lib/bootconfig.c:415:32: warning: conversion to 'long unsigned int'
from 'long int' may change the sign of the result [-Wsign-conversion]
Pointer subtraction yields ptrdiff_t (signed long), which was stored in
unsigned long. The offset is immediately checked against XBC_DATA_MAX
(32767) and then truncated to uint16_t, so unsigned int is sufficient.
Add an explicit cast on the subtraction to suppress the sign-conversion
warning.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 995c2ec94cbe..7296df003459 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -412,7 +412,7 @@ const char * __init xbc_node_find_next_key_value(struct xbc_node *root,
static int __init xbc_init_node(struct xbc_node *node, char *data, uint16_t flag)
{
- unsigned long offset = data - xbc_data;
+ unsigned int offset = (unsigned int)(data - xbc_data);
if (WARN_ON(offset >= XBC_DATA_MAX))
return -EINVAL;
--
2.34.1
^ permalink raw reply related
* [PATCH v5 21/23] lib/bootconfig: use size_t for key length tracking in xbc_verify_tree()
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
lib/bootconfig.c:839:24: warning: conversion from 'size_t' to 'int'
may change value [-Wconversion]
lib/bootconfig.c:860:32: warning: conversion from 'size_t' to 'int'
may change value [-Wconversion]
lib/bootconfig.c:860:29: warning: conversion to 'size_t' from 'int'
may change the sign of the result [-Wsign-conversion]
The key length variables len and wlen accumulate strlen() results but
were declared as int, causing truncation and sign-conversion warnings.
Change both to size_t to match the strlen() return type and avoid
mixed-sign arithmetic.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 7296df003459..e318b236e728 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -803,7 +803,8 @@ static int __init xbc_close_brace(char **k, char *n)
static int __init xbc_verify_tree(void)
{
- int i, depth, len, wlen;
+ int i, depth;
+ size_t len, wlen;
struct xbc_node *n, *m;
/* Brace closing */
--
2.34.1
^ permalink raw reply related
* [PATCH v5 22/23] lib/bootconfig: fix sign-compare in xbc_node_compose_key_after()
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
lib/bootconfig.c:322:25: warning: comparison of integer expressions
of different signedness: 'int' and 'size_t' [-Wsign-compare]
lib/bootconfig.c:325:30: warning: conversion to 'size_t' from 'int'
may change the sign of the result [-Wsign-conversion]
snprintf() returns int but size is size_t, so comparing ret >= size
and subtracting size -= ret involve mixed-sign operations. Cast ret
at the comparison and subtraction sites; ret is known non-negative at
this point because the ret < 0 early return has already been taken.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index e318b236e728..68a72dbc38fa 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -319,10 +319,10 @@ int __init xbc_node_compose_key_after(struct xbc_node *root,
depth ? "." : "");
if (ret < 0)
return ret;
- if (ret >= size) {
+ if (ret >= (int)size) {
size = 0;
} else {
- size -= ret;
+ size -= (size_t)ret;
buf += ret;
}
total += ret;
--
2.34.1
^ permalink raw reply related
* [PATCH v5 01/23] lib/bootconfig: add missing __init annotations to static helpers
From: Josh Law @ 2026-03-14 23:31 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton; +Cc: linux-kernel, linux-trace-kernel
In-Reply-To: <20260314233144.187273-1-objecting@objecting.org>
skip_comment() and skip_spaces_until_newline() are static functions
called exclusively from __init code paths but lack the __init
annotation themselves. Add it so their memory can be reclaimed after
init.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index b0ef1e74e98a..51fd2299ec0f 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -509,7 +509,7 @@ static inline __init bool xbc_valid_keyword(char *key)
return *key == '\0';
}
-static char *skip_comment(char *p)
+static char __init *skip_comment(char *p)
{
char *ret;
@@ -522,7 +522,7 @@ static char *skip_comment(char *p)
return ret;
}
-static char *skip_spaces_until_newline(char *p)
+static char __init *skip_spaces_until_newline(char *p)
{
while (isspace(*p) && *p != '\n')
p++;
--
2.34.1
^ permalink raw reply related
* Re: [PATCH net-next v2 13/14] netdevsim: add peer RX truesize support for selftests
From: Jakub Kicinski @ 2026-03-15 1:18 UTC (permalink / raw)
To: atwellwea
Cc: netdev, davem, pabeni, edumazet, ncardwell, linux-kernel,
linux-api, linux-doc, linux-kselftest, linux-trace-kernel, mptcp,
dsahern, horms, kuniyu, andrew+netdev, willemdebruijn.kernel,
jasowang, skhan, corbet, matttbe, martineau, geliang, rostedt,
mhiramat, mathieu.desnoyers, 0x7f454c46
In-Reply-To: <20260314201348.1786972-14-atwellwea@gmail.com>
On Sat, 14 Mar 2026 14:13:47 -0600 atwellwea@gmail.com wrote:
> diff --git a/tools/testing/selftests/drivers/net/netdevsim/Makefile b/tools/testing/selftests/drivers/net/netdevsim/Makefile
> index 1a228c5430f5..9e9e48d5913b 100644
> --- a/tools/testing/selftests/drivers/net/netdevsim/Makefile
> +++ b/tools/testing/selftests/drivers/net/netdevsim/Makefile
> @@ -14,6 +14,7 @@ TEST_PROGS := \
> macsec-offload.sh \
> nexthop.sh \
> peer.sh \
> + peer-rx-truesize.sh \
> psample.sh \
> tc-mq-visibility.sh \
> udp_tunnel_nic.sh \
I think our order checker thinks that is not alphabetical.
You can find the scripts here:
https://github.com/linux-netdev/nipa/tree/main/tests/patch/check_selftest
It'd be good if you can try the "running locally" section from README
^ permalink raw reply
* Re: [PATCH net-next v2 12/14] tun/selftests: add RX truesize injection for TCP window tests
From: Jakub Kicinski @ 2026-03-15 1:18 UTC (permalink / raw)
To: atwellwea
Cc: netdev, davem, pabeni, edumazet, ncardwell, linux-kernel,
linux-api, linux-doc, linux-kselftest, linux-trace-kernel, mptcp,
dsahern, horms, kuniyu, andrew+netdev, willemdebruijn.kernel,
jasowang, skhan, corbet, matttbe, martineau, geliang, rostedt,
mhiramat, mathieu.desnoyers, 0x7f454c46
In-Reply-To: <20260314201348.1786972-13-atwellwea@gmail.com>
On Sat, 14 Mar 2026 14:13:46 -0600 atwellwea@gmail.com wrote:
> Add a test-only TUN ioctl that inflates RX skb->truesize, plus the
> packetdrill-side helper needed to drive that ioctl through packetdrill's
> own TUN queue file descriptor.
>
> Use that plumbing to cover the receive-window regressions where
> scaling_ratio drifts after advertisement, alongside the baseline too-big
> packetdrill cases that exercise the same sender-visible rwnd accounting
> from the non-injected path.
You missed adding the tun program to the Makefile.
tcp-rcv-neg-window-truesize-pkt
tcp-rcv-toobig-default-truesize-pkt
tcp-rcv-wnd-shrink-allowed-truesize-pkt
Fail with:
sh: line 1: ../tun: No such file or directory
tcp_rcv_*_truesize.pkt:*: error executing `../tun --set-rx-truesize tun0 6553\
6` command: non-zero status 127
https://netdev.bots.linux.dev/contest.html?pw-n=0&branch=net-next-2026-03-15--00-00&pw-n=0&pass=0
^ permalink raw reply
* Re: [PATCH net-next v2 00/14] tcp: preserve receive-window accounting across ratio drift
From: Jakub Kicinski @ 2026-03-15 1:19 UTC (permalink / raw)
To: atwellwea
Cc: netdev, davem, pabeni, edumazet, ncardwell, linux-kernel,
linux-api, linux-doc, linux-kselftest, linux-trace-kernel, mptcp,
dsahern, horms, kuniyu, andrew+netdev, willemdebruijn.kernel,
jasowang, skhan, corbet, matttbe, martineau, geliang, rostedt,
mhiramat, mathieu.desnoyers, 0x7f454c46
In-Reply-To: <20260314201348.1786972-1-atwellwea@gmail.com>
On Sat, 14 Mar 2026 14:13:34 -0600 atwellwea@gmail.com wrote:
> This series keeps sender-visible TCP receive-window accounting tied to the
> scaling basis that was in force when the window was advertised, even if
> later receive-side truesize inflation lowers scaling_ratio or the live
> receive window retracts below the largest right edge already exposed to the
> sender.
Please wait until at least Monday before reposting this.
LLM-pocalypse is hitting us hard
^ permalink raw reply
* Re: [PATCH v4 09/17] lib/bootconfig: increment xbc_node_num after node init succeeds
From: Masami Hiramatsu @ 2026-03-15 8:16 UTC (permalink / raw)
To: Josh Law; +Cc: Andrew Morton, linux-trace-kernel, linux-kernel
In-Reply-To: <20260314230155.155777-10-objecting@objecting.org>
On Sat, 14 Mar 2026 23:01:47 +0000
Josh Law <objecting@objecting.org> wrote:
> Move the xbc_node_num increment to after xbc_init_node() so a failed
> init does not leave a partially initialized node counted in the array.
>
> If xbc_init_node() fails on a data offset at the boundary of a
> maximum-size bootconfig, the pre-incremented count causes subsequent
> tree verification and traversal to consider the uninitialized node as
> valid, potentially leading to an out-of-bounds read or unpredictable
> boot behavior.
In that case, it returns a parse error(-ENOMEM) and the parsing stops.
This seems a hardening not a fix unless actual example you can show.
Thank you,
>
> Signed-off-by: Josh Law <objecting@objecting.org>
> ---
> lib/bootconfig.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lib/bootconfig.c b/lib/bootconfig.c
> index 56fbedc9e725..06e8a79ab472 100644
> --- a/lib/bootconfig.c
> +++ b/lib/bootconfig.c
> @@ -429,9 +429,10 @@ static struct xbc_node * __init xbc_add_node(char *data, uint16_t flag)
> if (xbc_node_num == XBC_NODE_MAX)
> return NULL;
>
> - node = &xbc_nodes[xbc_node_num++];
> + node = &xbc_nodes[xbc_node_num];
> if (xbc_init_node(node, data, flag) < 0)
> return NULL;
> + xbc_node_num++;
>
> return node;
> }
> --
> 2.34.1
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply
* Re: [PATCH v4 17/17] tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure
From: Masami Hiramatsu @ 2026-03-15 8:16 UTC (permalink / raw)
To: Josh Law; +Cc: Andrew Morton, linux-trace-kernel, linux-kernel
In-Reply-To: <20260314230155.155777-18-objecting@objecting.org>
On Sat, 14 Mar 2026 23:01:55 +0000
Josh Law <objecting@objecting.org> wrote:
> If fstat() fails after open() succeeds, load_xbc_file() returns
> -errno without closing the file descriptor. Add the missing close()
> call on the error path.
>
OK, but anyway this exits soon after failure. So it does not
cause actual problem.
Fixes: 950313ebf79c ("tools: bootconfig: Add bootconfig command")
> Signed-off-by: Josh Law <objecting@objecting.org>
> ---
> tools/bootconfig/main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
> index 55d59ed507d5..8078fee0b75b 100644
> --- a/tools/bootconfig/main.c
> +++ b/tools/bootconfig/main.c
> @@ -162,8 +162,10 @@ static int load_xbc_file(const char *path, char **buf)
> if (fd < 0)
> return -errno;
> ret = fstat(fd, &stat);
> - if (ret < 0)
> + if (ret < 0) {
> + close(fd);
> return -errno;
> + }
>
> ret = load_xbc_fd(fd, buf, stat.st_size);
>
> --
> 2.34.1
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply
* Re: [PATCH v4 02/17] lib/bootconfig: fix typo "initiized" in xbc_root_node() kerneldoc
From: Masami Hiramatsu @ 2026-03-15 8:17 UTC (permalink / raw)
To: Josh Law; +Cc: Andrew Morton, linux-trace-kernel, linux-kernel
In-Reply-To: <20260314230155.155777-3-objecting@objecting.org>
Hi,
Thanks for cleaning ups. Can you fold [2/17][3/17][4/17] into 1 patch?
Those are just typo fixes and index/space fix, IOW, cosmetic change.
Thanks,
On Sat, 14 Mar 2026 23:01:40 +0000
Josh Law <objecting@objecting.org> wrote:
> Fix "initiized" to "initialized" in the xbc_root_node() kerneldoc
> comment.
>
> Signed-off-by: Josh Law <objecting@objecting.org>
> ---
> lib/bootconfig.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/bootconfig.c b/lib/bootconfig.c
> index 51fd2299ec0f..53aedc042f6e 100644
> --- a/lib/bootconfig.c
> +++ b/lib/bootconfig.c
> @@ -112,7 +112,7 @@ static int __init xbc_parse_error(const char *msg, const char *p)
> * xbc_root_node() - Get the root node of extended boot config
> *
> * Return the address of root node of extended boot config. If the
> - * extended boot config is not initiized, return NULL.
> + * extended boot config is not initialized, return NULL.
> */
> struct xbc_node * __init xbc_root_node(void)
> {
> --
> 2.34.1
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply
* Re: [PATCH v4 14/17] bootconfig: add __packed definition to tools/bootconfig shim header
From: Masami Hiramatsu @ 2026-03-15 8:18 UTC (permalink / raw)
To: Josh Law; +Cc: Andrew Morton, linux-trace-kernel, linux-kernel
In-Reply-To: <20260314230155.155777-15-objecting@objecting.org>
On Sat, 14 Mar 2026 23:01:52 +0000
Josh Law <objecting@objecting.org> wrote:
> The tools/bootconfig userspace build includes the main bootconfig.h
> via a shim header that defines kernel macros for userspace. Add the
> __packed macro so the struct xbc_node declaration works after the
> conversion from open-coded __attribute__((__packed__)).
>
NACK. Please do not self recover after break something by yourself
in the same series.
> Signed-off-by: Josh Law <objecting@objecting.org>
> ---
> tools/bootconfig/include/linux/bootconfig.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/tools/bootconfig/include/linux/bootconfig.h b/tools/bootconfig/include/linux/bootconfig.h
> index 6784296a0692..41c50ab95ba5 100644
> --- a/tools/bootconfig/include/linux/bootconfig.h
> +++ b/tools/bootconfig/include/linux/bootconfig.h
> @@ -48,6 +48,7 @@ static inline char *strim(char *s)
>
> #define __init
> #define __initdata
> +#define __packed __attribute__((__packed__))
>
> #include "../../../../include/linux/bootconfig.h"
>
> --
> 2.34.1
>
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply
* Re: [PATCH v4 11/17] bootconfig: use __packed macro for struct xbc_node
From: Masami Hiramatsu @ 2026-03-15 8:18 UTC (permalink / raw)
To: Josh Law; +Cc: Andrew Morton, linux-trace-kernel, linux-kernel
In-Reply-To: <20260314230155.155777-12-objecting@objecting.org>
On Sat, 14 Mar 2026 23:01:49 +0000
Josh Law <objecting@objecting.org> wrote:
> Replace the open-coded __attribute__((__packed__)) with the kernel
> __packed macro for consistency with the rest of the kernel.
NACK. Since I made this header to be shared with user tool.
As you sent in [14/17], this just breaks tools/bootconfig.
Thanks,
>
> Signed-off-by: Josh Law <objecting@objecting.org>
> ---
> include/linux/bootconfig.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h
> index 25df9260d206..c37e0096c4f1 100644
> --- a/include/linux/bootconfig.h
> +++ b/include/linux/bootconfig.h
> @@ -53,7 +53,7 @@ struct xbc_node {
> uint16_t child;
> uint16_t parent;
> uint16_t data;
> -} __attribute__ ((__packed__));
> +} __packed;
>
> #define XBC_KEY 0
> #define XBC_VALUE (1 << 15)
> --
> 2.34.1
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply
* Re: [PATCH v4 08/17] lib/bootconfig: fix off-by-one in xbc_verify_tree() next node check
From: Masami Hiramatsu @ 2026-03-15 8:19 UTC (permalink / raw)
To: Josh Law; +Cc: Andrew Morton, linux-trace-kernel, linux-kernel
In-Reply-To: <20260314230155.155777-9-objecting@objecting.org>
On Sat, 14 Mar 2026 23:01:46 +0000
Josh Law <objecting@objecting.org> wrote:
> Valid node indices are 0 to xbc_node_num-1, so a next value equal to
> xbc_node_num is out of bounds. Use >= instead of > to catch this.
>
> A malformed or corrupt bootconfig could pass tree verification with
> an out-of-bounds next index. On subsequent tree traversal at boot
> time, xbc_node_get_next() would return a pointer past the allocated
> xbc_nodes array, causing an out-of-bounds read of kernel memory.
>
Thanks, but How? Do you have any actual config example?
Unless that, I would like to treat this as a minor fix.
Thanks,
> Signed-off-by: Josh Law <objecting@objecting.org>
> ---
> lib/bootconfig.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/bootconfig.c b/lib/bootconfig.c
> index 58d6ae297280..56fbedc9e725 100644
> --- a/lib/bootconfig.c
> +++ b/lib/bootconfig.c
> @@ -816,7 +816,7 @@ static int __init xbc_verify_tree(void)
> }
>
> for (i = 0; i < xbc_node_num; i++) {
> - if (xbc_nodes[i].next > xbc_node_num) {
> + if (xbc_nodes[i].next >= xbc_node_num) {
> return xbc_parse_error("No closing brace",
> xbc_node_get_data(xbc_nodes + i));
> }
> --
> 2.34.1
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply
* Re: [PATCH v4 07/17] lib/bootconfig: fix inconsistent if/else bracing in __xbc_add_key()
From: Masami Hiramatsu @ 2026-03-15 8:20 UTC (permalink / raw)
To: Josh Law; +Cc: Andrew Morton, linux-trace-kernel, linux-kernel
In-Reply-To: <20260314230155.155777-8-objecting@objecting.org>
On Sat, 14 Mar 2026 23:01:45 +0000
Josh Law <objecting@objecting.org> wrote:
> When one branch of a conditional uses braces, both branches should
> use them per coding-style section 3.1. Add the missing braces to
> the if/else blocks in __xbc_add_key().
It is just a cosmetic cleanup.
Can you fold this with other typo fixes?
THank you,
>
> Signed-off-by: Josh Law <objecting@objecting.org>
> ---
> lib/bootconfig.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/bootconfig.c b/lib/bootconfig.c
> index 34bdc2d13881..58d6ae297280 100644
> --- a/lib/bootconfig.c
> +++ b/lib/bootconfig.c
> @@ -657,9 +657,9 @@ static int __init __xbc_add_key(char *k)
> if (unlikely(xbc_node_num == 0))
> goto add_node;
>
> - if (!last_parent) /* the first level */
> + if (!last_parent) { /* the first level */
> node = find_match_node(xbc_nodes, k);
> - else {
> + } else {
> child = xbc_node_get_child(last_parent);
> /* Since the value node is the first child, skip it. */
> if (child && xbc_node_is_value(child))
> @@ -667,9 +667,9 @@ static int __init __xbc_add_key(char *k)
> node = find_match_node(child, k);
> }
>
> - if (node)
> + if (node) {
> last_parent = node;
> - else {
> + } else {
> add_node:
> node = xbc_add_child(k, XBC_KEY);
> if (!node)
> --
> 2.34.1
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply
* Re: [PATCH v4 16/17] lib/bootconfig: check xbc_init_node() return in override path
From: Masami Hiramatsu @ 2026-03-15 8:29 UTC (permalink / raw)
To: Josh Law; +Cc: Andrew Morton, linux-trace-kernel, linux-kernel
In-Reply-To: <20260314230155.155777-17-objecting@objecting.org>
On Sat, 14 Mar 2026 23:01:54 +0000
Josh Law <objecting@objecting.org> wrote:
> The ':=' override path in xbc_parse_kv() calls xbc_init_node() to
> re-initialize an existing value node but does not check the return
> value. If xbc_init_node() fails (data offset out of range), parsing
> silently continues with stale node data.
>
> Add the missing error check to match the xbc_add_node() call path
> which already checks for failure.
>
> In practice, a bootconfig using ':=' to override a value near the
> 32KB data limit could silently retain the old value, meaning a
> security-relevant boot parameter override (e.g., a trace filter or
> debug setting) would not take effect as intended.
OK, this is a real bug. It should be handled.
Fixes: e5efaeb8a8f5 ("bootconfig: Support mixing a value and subkeys under a key")
Thanks,
>
> Signed-off-by: Josh Law <objecting@objecting.org>
> ---
> lib/bootconfig.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lib/bootconfig.c b/lib/bootconfig.c
> index 038f56689a48..182d9d9bc5a6 100644
> --- a/lib/bootconfig.c
> +++ b/lib/bootconfig.c
> @@ -728,7 +728,8 @@ static int __init xbc_parse_kv(char **k, char *v, int op)
> if (op == ':') {
> unsigned short nidx = child->next;
>
> - xbc_init_node(child, v, XBC_VALUE);
> + if (xbc_init_node(child, v, XBC_VALUE) < 0)
> + return xbc_parse_error("Failed to override value", v);
> child->next = nidx; /* keep subkeys */
> goto array;
> }
> --
> 2.34.1
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply
* Re: [PATCH v4 00/17] bootconfig: fixes, cleanups, and modernization
From: Masami Hiramatsu @ 2026-03-15 8:30 UTC (permalink / raw)
To: Josh Law; +Cc: Andrew Morton, linux-trace-kernel, linux-kernel
In-Reply-To: <20260314230155.155777-1-objecting@objecting.org>
Hi Josh,
Thanks for cleaning up. I had some comments. Please check my reply.
Basically, I don't see any urgent bugfixes in this series. In summary;
OK for-next: [01][06][08][09][10][12][13][15]
Need Fixed taa: [16][17]
Request to fold:[02][03][04][05][07]
NACK: [11][14]
Thank you,
On Sat, 14 Mar 2026 23:01:38 +0000
Josh Law <objecting@objecting.org> wrote:
> This series addresses a collection of issues found during a review of
> lib/bootconfig.c, include/linux/bootconfig.h, and tools/bootconfig,
> ranging from off-by-one errors and unchecked return values to coding
> style and API modernization.
>
> Changes since v3:
> - Added commit descriptions to all patches that were missing them
> (patches 2, 3, 4, 7).
> - Added real-world impact statements to all bug-fix patches
> (patches 8, 9, 15, 16).
>
> Changes since v2:
> - Added "validate child node index in xbc_verify_tree()" —
> xbc_verify_tree() validated next-node indices but not child indices;
> an out-of-bounds child would cause xbc_node_get_child() to access
> memory beyond the xbc_nodes array (patch 15).
> - Added "check xbc_init_node() return in override path" — the ':='
> override path in xbc_parse_kv() ignored xbc_init_node()'s return
> value, silently continuing with stale node data on failure
> (patch 16).
> - Added "fix fd leak in load_xbc_file() on fstat failure" — if
> fstat() failed after open() succeeded, the file descriptor was
> leaked (patch 17).
>
> Changes since v1:
> - Dropped "return empty string instead of NULL from
> xbc_node_get_data()" — returning "" causes false matches in
> xbc_node_match_prefix() because strncmp(..., "", 0) always
> returns 0.
>
> Bug fixes:
> - Fix off-by-one in xbc_verify_tree() where a next-node index equal
> to xbc_node_num passes the bounds check despite being out of range;
> a malformed bootconfig could cause an out-of-bounds read of kernel
> memory during tree traversal at boot time (patch 8).
> - Move xbc_node_num increment to after xbc_init_node() validation
> so a failed init does not leave a partially initialized node
> counted in the array; on a maximum-size bootconfig, the
> uninitialized node could be traversed leading to unpredictable
> boot behavior (patch 9).
> - Validate child node indices in xbc_verify_tree() alongside the
> existing next-node check; without this, a corrupt bootconfig could
> trigger an out-of-bounds memory access via an invalid child index
> during tree traversal (patch 15).
> - Check xbc_init_node() return value in the ':=' override path; a
> bootconfig using ':=' near the 32KB data limit could silently
> retain the old value, meaning a security-relevant boot parameter
> override would not take effect (patch 16).
> - Fix file descriptor leak in tools/bootconfig load_xbc_file()
> when fstat() fails (patch 17).
>
> Correctness:
> - Add missing __init annotations to skip_comment() and
> skip_spaces_until_newline() so their memory can be reclaimed
> after init (patch 1).
> - Narrow the flag parameter in node creation helpers from uint32_t
> to uint16_t to match the xbc_node.data field width (patch 6).
> - Constify the xbc_calc_checksum() data parameter since it only
> reads the buffer (patch 12).
>
> Cleanups:
> - Fix comment typos (patches 2-3), missing blank line before
> kerneldoc (patch 4), inconsistent if/else bracing (patches 5, 7).
> - Drop redundant memset after memblock_alloc which already returns
> zeroed memory; switch the userspace path from malloc to calloc
> to match (patch 10).
>
> Modernization:
> - Replace open-coded __attribute__((__packed__)) with the __packed
> macro, adding the definition to the tools/bootconfig shim header
> (patches 11, 14).
> - Replace the catch-all linux/kernel.h include with the specific
> headers needed: linux/cache.h, linux/compiler.h, and
> linux/sprintf.h (patch 13).
>
> Build-tested with both the in-kernel build (lib/bootconfig.o,
> init/main.o) and the userspace tools/bootconfig build. All 70
> tools/bootconfig test cases pass.
>
> Josh Law (17):
> lib/bootconfig: add missing __init annotations to static helpers
> lib/bootconfig: fix typo "initiized" in xbc_root_node() kerneldoc
> lib/bootconfig: fix typo "uder" in xbc_node_find_next_leaf()
> lib/bootconfig: add blank line before xbc_get_info() kerneldoc
> lib/bootconfig: fix inconsistent if/else bracing
> lib/bootconfig: narrow flag parameter type from uint32_t to uint16_t
> lib/bootconfig: fix inconsistent if/else bracing in __xbc_add_key()
> lib/bootconfig: fix off-by-one in xbc_verify_tree() next node check
> lib/bootconfig: increment xbc_node_num after node init succeeds
> lib/bootconfig: drop redundant memset of xbc_nodes
> bootconfig: use __packed macro for struct xbc_node
> bootconfig: constify xbc_calc_checksum() data parameter
> lib/bootconfig: replace linux/kernel.h with specific includes
> bootconfig: add __packed definition to tools/bootconfig shim header
> lib/bootconfig: validate child node index in xbc_verify_tree()
> lib/bootconfig: check xbc_init_node() return in override path
> tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure
>
> include/linux/bootconfig.h | 6 +--
> lib/bootconfig.c | 54 ++++++++++++---------
> tools/bootconfig/include/linux/bootconfig.h | 1 +
> tools/bootconfig/main.c | 4 +-
> 4 files changed, 39 insertions(+), 26 deletions(-)
>
> --
> 2.34.1
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply
* [PATCH v6 00/17] bootconfig: fixes, cleanups, and modernization
From: Josh Law @ 2026-03-15 12:19 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton
Cc: Steven Rostedt, linux-kernel, linux-trace-kernel, Josh Law
This series addresses a collection of issues found during a review of
lib/bootconfig.c, include/linux/bootconfig.h, and tools/bootconfig,
ranging from off-by-one errors and unchecked return values to coding
style, signedness/type cleanup, and API modernization.
Changes since v5:
- Folded typo fixes, kerneldoc blank line, and inconsistent bracing
patches (v5 02-05, 07) into a single patch (patch 2).
- Dropped "use __packed macro for struct xbc_node" (v5 11) and
"add __packed definition to tools/bootconfig shim header" (v5 14)
per review feedback.
- Added Fixes: tag to "check xbc_init_node() return in override
path" (patch 10).
- Added Fixes: tag to "fix fd leak in load_xbc_file() on fstat
failure" (patch 11).
Changes since v4:
- Added six follow-up patches found via static analysis with strict
GCC warnings (patches 12-17).
- Added "fix signed comparison in xbc_node_get_data()" -- switch the
masked offset variable to unsigned int and compare against
XBC_DATA_MAX to avoid a signed comparison and make the mask
self-documenting (patch 12).
- Added "use size_t for strlen result in xbc_node_match_prefix()"
and "use size_t for key length tracking in xbc_verify_tree()" to
match strlen() return types (patches 13, 15).
- Added "narrow offset type in xbc_init_node()" -- use a validated
unsigned int temporary for the stored 15-bit data offset
(patch 14).
- Added "fix sign-compare in xbc_node_compose_key_after()" -- cast
the checked snprintf() return when comparing and subtracting
against a size_t buffer length (patch 16).
- Added "change xbc_node_index() return type to uint16_t" -- match
the 16-bit storage fields and XBC_NODE_MAX bounds (patch 17).
Changes since v3:
- Added commit descriptions to all patches that were missing them.
- Added real-world impact statements to all bug-fix patches.
Changes since v2:
- Added "validate child node index in xbc_verify_tree()" (patch 9).
- Added "check xbc_init_node() return in override path" (patch 10).
- Added "fix fd leak in load_xbc_file() on fstat failure" (patch 11).
Changes since v1:
- Dropped "return empty string instead of NULL from
xbc_node_get_data()" -- returning "" causes false matches in
xbc_node_match_prefix() because strncmp(..., "", 0) always
returns 0.
Bug fixes:
- Fix off-by-one in xbc_verify_tree() where a next-node index equal
to xbc_node_num passes the bounds check despite being out of range;
a malformed bootconfig could cause an out-of-bounds read of kernel
memory during tree traversal at boot time (patch 4).
- Move xbc_node_num increment to after xbc_init_node() validation
so a failed init does not leave a partially initialized node
counted in the array; on a maximum-size bootconfig, the
uninitialized node could be traversed leading to unpredictable
boot behavior (patch 5).
- Validate child node indices in xbc_verify_tree() alongside the
existing next-node check; without this, a corrupt bootconfig could
trigger an out-of-bounds memory access via an invalid child index
during tree traversal (patch 9).
- Check xbc_init_node() return value in the ':=' override path; a
bootconfig using ':=' near the 32KB data limit could silently
retain the old value, meaning a security-relevant boot parameter
override would not take effect (patch 10).
- Fix file descriptor leak in tools/bootconfig load_xbc_file()
when fstat() fails (patch 11).
Correctness:
- Add missing __init annotations to skip_comment() and
skip_spaces_until_newline() so their memory can be reclaimed
after init (patch 1).
- Narrow the flag parameter in node creation helpers from uint32_t
to uint16_t to match the xbc_node.data field width (patch 3).
- Constify the xbc_calc_checksum() data parameter since it only
reads the buffer (patch 7).
- Fix strict-GCC signedness and narrowing warnings by aligning local
types with strlen()/snprintf() APIs and the 16-bit node index/data
storage in xbc_node_get_data(), xbc_node_match_prefix(),
xbc_init_node(), xbc_verify_tree(), xbc_node_compose_key_after(),
and xbc_node_index() (patches 12-17).
Cleanups:
- Fix comment typos, missing blank line before kerneldoc,
inconsistent if/else bracing (patch 2).
- Drop redundant memset after memblock_alloc which already returns
zeroed memory; switch the userspace path from malloc to calloc
to match (patch 6).
Modernization:
- Replace the catch-all linux/kernel.h include with the specific
headers needed: linux/cache.h, linux/compiler.h, and
linux/sprintf.h (patch 8).
Build-tested with both the in-kernel build (lib/bootconfig.o,
init/main.o) and the userspace tools/bootconfig build. All 70
tools/bootconfig test cases pass.
Josh Law (17):
lib/bootconfig: add missing __init annotations to static helpers
lib/bootconfig: fix typos, kerneldoc, and inconsistent if/else bracing
lib/bootconfig: narrow flag parameter type from uint32_t to uint16_t
lib/bootconfig: fix off-by-one in xbc_verify_tree() next node check
lib/bootconfig: increment xbc_node_num after node init succeeds
lib/bootconfig: drop redundant memset of xbc_nodes
bootconfig: constify xbc_calc_checksum() data parameter
lib/bootconfig: replace linux/kernel.h with specific includes
lib/bootconfig: validate child node index in xbc_verify_tree()
lib/bootconfig: check xbc_init_node() return in override path
tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure
lib/bootconfig: fix signed comparison in xbc_node_get_data()
lib/bootconfig: use size_t for strlen result in
xbc_node_match_prefix()
lib/bootconfig: narrow offset type in xbc_init_node()
lib/bootconfig: use size_t for key length tracking in
xbc_verify_tree()
lib/bootconfig: fix sign-compare in xbc_node_compose_key_after()
lib/bootconfig: change xbc_node_index() return type to uint16_t
include/linux/bootconfig.h | 6 ++--
lib/bootconfig.c | 71 ++++++++++++++++++++++----------------
tools/bootconfig/main.c | 4 ++-
3 files changed, 47 insertions(+), 34 deletions(-)
--
2.34.1
^ permalink raw reply
* [PATCH v6 01/17] lib/bootconfig: add missing __init annotations to static helpers
From: Josh Law @ 2026-03-15 12:19 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton
Cc: Steven Rostedt, linux-kernel, linux-trace-kernel, Josh Law
In-Reply-To: <20260315122015.55965-1-objecting@objecting.org>
skip_comment() and skip_spaces_until_newline() are static functions
called exclusively from __init code paths but lack the __init
annotation themselves. Add it so their memory can be reclaimed after
init.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index b0ef1e74e98a..51fd2299ec0f 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -509,7 +509,7 @@ static inline __init bool xbc_valid_keyword(char *key)
return *key == '\0';
}
-static char *skip_comment(char *p)
+static char __init *skip_comment(char *p)
{
char *ret;
@@ -522,7 +522,7 @@ static char *skip_comment(char *p)
return ret;
}
-static char *skip_spaces_until_newline(char *p)
+static char __init *skip_spaces_until_newline(char *p)
{
while (isspace(*p) && *p != '\n')
p++;
--
2.34.1
^ permalink raw reply related
* [PATCH v6 03/17] lib/bootconfig: narrow flag parameter type from uint32_t to uint16_t
From: Josh Law @ 2026-03-15 12:20 UTC (permalink / raw)
To: Masami Hiramatsu, Andrew Morton
Cc: Steven Rostedt, linux-kernel, linux-trace-kernel, Josh Law
In-Reply-To: <20260315122015.55965-1-objecting@objecting.org>
The flag parameter in the node creation helpers only ever carries
XBC_KEY (0) or XBC_VALUE (0x8000), both of which fit in uint16_t.
Using uint16_t matches the width of xbc_node.data where the flag is
ultimately stored.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 80de9540245d..58d6ae297280 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -408,7 +408,7 @@ const char * __init xbc_node_find_next_key_value(struct xbc_node *root,
/* XBC parse and tree build */
-static int __init xbc_init_node(struct xbc_node *node, char *data, uint32_t flag)
+static int __init xbc_init_node(struct xbc_node *node, char *data, uint16_t flag)
{
unsigned long offset = data - xbc_data;
@@ -422,7 +422,7 @@ static int __init xbc_init_node(struct xbc_node *node, char *data, uint32_t flag
return 0;
}
-static struct xbc_node * __init xbc_add_node(char *data, uint32_t flag)
+static struct xbc_node * __init xbc_add_node(char *data, uint16_t flag)
{
struct xbc_node *node;
@@ -452,7 +452,7 @@ static inline __init struct xbc_node *xbc_last_child(struct xbc_node *node)
return node;
}
-static struct xbc_node * __init __xbc_add_sibling(char *data, uint32_t flag, bool head)
+static struct xbc_node * __init __xbc_add_sibling(char *data, uint16_t flag, bool head)
{
struct xbc_node *sib, *node = xbc_add_node(data, flag);
@@ -480,17 +480,17 @@ static struct xbc_node * __init __xbc_add_sibling(char *data, uint32_t flag, boo
return node;
}
-static inline struct xbc_node * __init xbc_add_sibling(char *data, uint32_t flag)
+static inline struct xbc_node * __init xbc_add_sibling(char *data, uint16_t flag)
{
return __xbc_add_sibling(data, flag, false);
}
-static inline struct xbc_node * __init xbc_add_head_sibling(char *data, uint32_t flag)
+static inline struct xbc_node * __init xbc_add_head_sibling(char *data, uint16_t flag)
{
return __xbc_add_sibling(data, flag, true);
}
-static inline __init struct xbc_node *xbc_add_child(char *data, uint32_t flag)
+static inline __init struct xbc_node *xbc_add_child(char *data, uint16_t flag)
{
struct xbc_node *node = xbc_add_sibling(data, flag);
--
2.34.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox