@@ -83,6 +83,7 @@ static bool external;
static bool libretto;
static bool nostretch;
static bool nopciburst;
+static char *mode_option_buf;
static char *mode_option = NULL;
#ifdef MODULE
@@ -2198,8 +2199,11 @@ static int __init neofb_setup(char *options)
nopciburst = 1;
else if (!strncmp(this_opt, "libretto", 8))
libretto = 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;
}
@@ -2228,6 +2232,7 @@ module_init(neofb_init);
static void __exit neofb_exit(void)
{
pci_unregister_driver(&neofb_driver);
+ kfree(mode_option_buf);
}
module_exit(neofb_exit);
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/neofb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)