nios2 update for v5.4-rc1
nios2: force the string buffer NULL-terminated -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJdhHjJAAoJEFWoEK+e3syCsw4QAIffV6Nvnx3FVD3K+UIuymEb +rgxk4pZh5I9UaoGqIcCQH80eLAn0nnqCyMHtGfZwqgDLL1mKqgb8B5gK/2g6mow cF9uxeoVBcknCnWIgiuT2nJ1h+FLLPIcR4z9wkQgJ44tKWEZP2psDho+H7gzjHdc ocBFAxtrNlCZ1V2FkoceJ6h34DVbMpjyPE7Wt9I5MGPyTiQC1WxvjzGHrwEWGh7z 4yPg92eKvaABGtjxFx/HLJX34Qry4GZwjaVZtB3iQjoxCdR4ysNjWf4HgZcLwJtF aqvsvBABWlSBaOGr3Gv8qlpqYDaj0/ThuZJQXKxGnx2nsGOfRYV+ziT37WaShV/V e3Lpx8pJArQyJVwOA5uKGCuhHRJxXKW2t6SM8a22XTBKPwc9SXGRg765XfEhU76B j/xwjw3UJqX0iS0bPKlC9cskKP+Jt13EdD9iQJMzJZUiZwWkTWuzb4EFpbfJPiOm NJs5QCcjat47l/zSpLgqcp3zqCUaFn8bUfxsRyz42IuyLCi5l9+lB9yGcbGS8GmN +XxM5xCOnuElIF2arbeYCFZGJJVyzgugYaCtBAVfIFU0qdaQ4+nv01L/ODKCAIBg 3L8y+Lk8/sqBWCraa6m+0ZVhWPIyGQIGgKUk2kRYqMuLieTHmOb+fvSiK6HD7aqE WXBq0Lss5pi+4DrvtTeH =AWE5 -----END PGP SIGNATURE----- Merge tag 'nios2-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 Pull nios2 fix from Ley Foon Tan: "Make sure the command line buffer is NUL-terminated" * tag 'nios2-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2: nios2: force the string buffer NULL-terminated
This commit is contained in:
Коммит
70570a6418
|
@ -123,7 +123,7 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6,
|
|||
dtb_passed = r6;
|
||||
|
||||
if (r7)
|
||||
strncpy(cmdline_passed, (char *)r7, COMMAND_LINE_SIZE);
|
||||
strlcpy(cmdline_passed, (char *)r7, COMMAND_LINE_SIZE);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -131,10 +131,10 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6,
|
|||
|
||||
#ifndef CONFIG_CMDLINE_FORCE
|
||||
if (cmdline_passed[0])
|
||||
strncpy(boot_command_line, cmdline_passed, COMMAND_LINE_SIZE);
|
||||
strlcpy(boot_command_line, cmdline_passed, COMMAND_LINE_SIZE);
|
||||
#ifdef CONFIG_NIOS2_CMDLINE_IGNORE_DTB
|
||||
else
|
||||
strncpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
|
||||
strlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче