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 032/101] fbdev/i740fb: 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/i740fb.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/drivers/video/fbdev/i740fb.c b/drivers/video/fbdev/i740fb.c
    index 3860b137b86a..61c022b8d5de 100644
    --- a/drivers/video/fbdev/i740fb.c
    +++ b/drivers/video/fbdev/i740fb.c
    @@ -31,6 +31,7 @@

    #include "i740_reg.h"

    +static char *mode_option_buf;
    static char *mode_option;
    static int mtrr = 1;

    @@ -1273,8 +1274,11 @@ static int __init i740fb_setup(char *options)
    continue;
    else if (!strncmp(opt, "mtrr:", 5))
    mtrr = simple_strtoul(opt + 5, NULL, 0);
    - else
    - mode_option = opt;
    + else {
    + kfree(mode_option_buf);
    + mode_option_buf = kstrdup(opt, GFP_KERNEL); // ignore errors
    + mode_option = mode_option_buf;
    + }
    }

    return 0;
    @@ -1302,6 +1306,7 @@ static int __init i740fb_init(void)
    static void __exit i740fb_exit(void)
    {
    pci_unregister_driver(&i740fb_driver);
    + kfree(mode_option_buf);
    }

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