fs/proc: remove redundant comments from /proc/bootconfig
BugLink: https://bugs.launchpad.net/bugs/2065912 commit fbbdc255fbee59b4207a5398fdb4f04590681a79 upstream. commit717c7c894d("fs/proc: Add boot loader arguments as comment to /proc/bootconfig") adds bootloader argument comments into /proc/bootconfig. /proc/bootconfig shows boot_command_line[] multiple times following every xbc key value pair, that's duplicated and not necessary. Remove redundant ones. Output before and after the fix is like: key1 = value1 *bootloader argument comments* key2 = value2 *bootloader argument comments* key3 = value3 *bootloader argument comments* ... key1 = value1 key2 = value2 key3 = value3 *bootloader argument comments* ... Link: https://lore.kernel.org/all/20240409044358.1156477-1-paulmck@kernel.org/ Fixes:717c7c894d("fs/proc: Add boot loader arguments as comment to /proc/bootconfig") Signed-off-by: Zhenhua Huang <quic_zhenhuah@quicinc.com> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> Cc: <linux-trace-kernel@vger.kernel.org> Cc: <linux-fsdevel@vger.kernel.org> Cc: stable@vger.kernel.org Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
This commit is contained in:
committed by
Stefan Bader
parent
fc09abd251
commit
7e5b881db7
@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)
|
||||
break;
|
||||
dst += ret;
|
||||
}
|
||||
if (ret >= 0 && boot_command_line[0]) {
|
||||
ret = snprintf(dst, rest(dst, end), "# Parameters from bootloader:\n# %s\n",
|
||||
boot_command_line);
|
||||
if (ret > 0)
|
||||
dst += ret;
|
||||
}
|
||||
}
|
||||
if (ret >= 0 && boot_command_line[0]) {
|
||||
ret = snprintf(dst, rest(dst, end), "# Parameters from bootloader:\n# %s\n",
|
||||
boot_command_line);
|
||||
if (ret > 0)
|
||||
dst += ret;
|
||||
}
|
||||
out:
|
||||
kfree(key);
|
||||
|
||||
Reference in New Issue
Block a user