lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 103/173] xtensa: ISS: dont allocate memory in platform_setup
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Max Filippov <jcmvbkbc@gmail.com>

    commit ef439d49e0bfb26cd5f03c88b4cb7cc9073ed30c upstream.

    Memory allocator is not initialized at that point yet, use static array
    instead.

    Cc: stable@vger.kernel.org
    Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/xtensa/platforms/iss/setup.c | 25 +++++++++++++++----------
    1 file changed, 15 insertions(+), 10 deletions(-)

    --- a/arch/xtensa/platforms/iss/setup.c
    +++ b/arch/xtensa/platforms/iss/setup.c
    @@ -78,23 +78,28 @@ static struct notifier_block iss_panic_b

    void __init platform_setup(char **p_cmdline)
    {
    + static void *argv[COMMAND_LINE_SIZE / sizeof(void *)] __initdata;
    + static char cmdline[COMMAND_LINE_SIZE] __initdata;
    int argc = simc_argc();
    int argv_size = simc_argv_size();

    if (argc > 1) {
    - void **argv = alloc_bootmem(argv_size);
    - char *cmdline = alloc_bootmem(argv_size);
    - int i;
    + if (argv_size > sizeof(argv)) {
    + pr_err("%s: command line too long: argv_size = %d\n",
    + __func__, argv_size);
    + } else {
    + int i;

    - cmdline[0] = 0;
    - simc_argv((void *)argv);
    + cmdline[0] = 0;
    + simc_argv((void *)argv);

    - for (i = 1; i < argc; ++i) {
    - if (i > 1)
    - strcat(cmdline, " ");
    - strcat(cmdline, argv[i]);
    + for (i = 1; i < argc; ++i) {
    + if (i > 1)
    + strcat(cmdline, " ");
    + strcat(cmdline, argv[i]);
    + }
    + *p_cmdline = cmdline;
    }
    - *p_cmdline = cmdline;
    }

    atomic_notifier_chain_register(&panic_notifier_list, &iss_panic_block);

    \
     
     \ /
      Last update: 2018-09-24 14:54    [W:4.108 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site