lkml.org 
[lkml]   [2023]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 057/101] fbdev/pm2fb: Duplicate video-mode option string
    Date
    Assume that the driver does not own the option string or its substrings
    and hence duplicate the option string for the video mode. Allocate the
    copy's memory with kstrdup() and free it in the module's exit function.

    Done in preparation of switching the driver to struct option_iter and
    constifying the option string.

    v2:
    * replace static memory with kstrdup()/kfree() (Geert)

    Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
    ---
    drivers/video/fbdev/pm2fb.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/drivers/video/fbdev/pm2fb.c b/drivers/video/fbdev/pm2fb.c
    index 47d212944f30..69a0b2216a86 100644
    --- a/drivers/video/fbdev/pm2fb.c
    +++ b/drivers/video/fbdev/pm2fb.c
    @@ -64,6 +64,7 @@
    * Driver data
    */
    static int hwcursor = 1;
    +static char *mode_option_buf;
    static char *mode_option;

    /*
    @@ -1792,8 +1793,11 @@ static int __init pm2fb_setup(char *options)
    nomtrr = 1;
    else if (!strncmp(this_opt, "noaccel", 7))
    noaccel = 1;
    - else
    - mode_option = this_opt;
    + else {
    + kfree(mode_option_buf);
    + mode_option_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors
    + mode_option = mode_option_buf;
    + }
    }
    return 0;
    }
    @@ -1828,6 +1832,7 @@ module_init(pm2fb_init);
    static void __exit pm2fb_exit(void)
    {
    pci_unregister_driver(&pm2fb_driver);
    + kfree(mode_option_buf);
    }
    #endif

    --
    2.39.2
    \
     
     \ /
      Last update: 2023-03-27 00:52    [W:5.949 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site