diff options
author | David S. Miller <davem@davemloft.net> | 2021-10-22 13:41:16 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-10-22 13:41:16 +0300 |
commit | bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2 (patch) | |
tree | 45115e9c988cbaa49f3766cbe6e6775757cb8c20 /init/main.c | |
parent | ab98bbee072c7c30c391ae742b209efebb468273 (diff) | |
parent | 64222515138e43da1fcf288f0289ef1020427b87 (diff) | |
download | linux-bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of simnple overlapping additions.
With a build fix from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 81a79a77db46..3c4054a95545 100644 --- a/init/main.c +++ b/init/main.c @@ -382,6 +382,7 @@ static char * __init xbc_make_cmdline(const char *key) ret = xbc_snprint_cmdline(new_cmdline, len + 1, root); if (ret < 0 || ret > len) { pr_err("Failed to print extra kernel cmdline.\n"); + memblock_free_ptr(new_cmdline, len + 1); return NULL; } |