[PATCH v2 080/101] fbdev/tdfxfb: Duplicate video-mode option string

From
Thomas Zimmermann <tzimmermann@suse.de>
Date
2023-03-09 16:11:26
Also in
dri-devel, lkml
Reply to
Thomas Zimmermann, 2023-03-09
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/tdfxfb.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/tdfxfb.c b/drivers/video/fbdev/tdfxfb.c
index d17e5e1472aa..ccce6dac443d 100644
--- a/drivers/video/fbdev/tdfxfb.c
+++ b/drivers/video/fbdev/tdfxfb.c
@@ -150,6 +150,7 @@ MODULE_DEVICE_TABLE(pci, tdfxfb_id_table);
 static int nopan;
 static int nowrap = 1;      /* not implemented (yet) */
 static int hwcursor = 1;
+static char *mode_option_buf;
 static char *mode_option;
 static bool nomtrr;
 
@@ -1589,7 +1590,9 @@ static void __init tdfxfb_setup(char *options)
 		} else if (!strncmp(this_opt, "nomtrr", 6)) {
 			nomtrr = 1;
 		} else {
-			mode_option = this_opt;
+			kfree(mode_option_buf);
+			mode_option_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors
+			mode_option = mode_option_buf;
 		}
 	}
 }
@@ -1649,6 +1652,7 @@ static int __init tdfxfb_init(void)
 static void __exit tdfxfb_exit(void)
 {
 	pci_unregister_driver(&tdfxfb_driver);
+	kfree(mode_option_buf);
 }
 
 MODULE_AUTHOR("Hannu Mallat <hmallat@cc.hut.fi>");
-- 
2.39.2
Thread (112 messages) 112 messages, 4 authors, last reply 2023-03-21
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help