Assume that the driver does not own the option string or its substrings
and hence duplicate the option string for the video mode. The driver only
parses the option string once as part of module initialization, so use
a static buffer to store the duplicated mode option. Linux automatically
frees the memory upon releasing the module.

Done in preparation of constifying the option string.

Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
---
 drivers/video/fbdev/arkfb.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/arkfb.c b/drivers/video/fbdev/arkfb.c
index 60a96fdb5dd8..f83fcdaec7a0 100644
--- a/drivers/video/fbdev/arkfb.c
+++ b/drivers/video/fbdev/arkfb.c
@@ -1196,8 +1196,17 @@ static int __init arkfb_init(void)
        if (fb_get_options("arkfb", &option))
                return -ENODEV;
 
-       if (option && *option)
-               mode_option = option;
+       if (option && *option) {
+               static char mode_option_buf[256];
+               int ret;
+
+               ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", 
option);
+               if (WARN(ret < 0, "arkfb: ignoring invalid option, ret=%d\n", 
ret))
+                       continue;
+               if (WARN(ret >= sizeof(mode_option_buf), "arkfb: option too 
long\n"))
+                       continue;
+               mode_option = mode_option_buf;
+       }
 #endif
 
        pr_debug("arkfb: initializing\n");
-- 
2.39.2

Reply via email to