| Message ID | 20230306160016.4459-8-tzimmermann@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | fbdev: Fix memory leak in option parsing | expand |
Hi Thomas,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-misc/drm-misc-next]
[also build test WARNING on staging/staging-testing staging/staging-next staging/staging-linus linus/master v6.3-rc1 next-20230306]
[cannot apply to deller-parisc/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Thomas-Zimmermann/lib-Add-option-iterator/20230307-000524
base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next
patch link: https://lore.kernel.org/r/20230306160016.4459-8-tzimmermann%40suse.de
patch subject: [PATCH 07/99] fbdev/amifb: Parse option string with struct option_iter
config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20230307/202303070108.gtLwdySM-lkp@intel.com/config)
compiler: m68k-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/0b2c4af3b565e5ee830f7ed8e844d89237938f96
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Thomas-Zimmermann/lib-Add-option-iterator/20230307-000524
git checkout 0b2c4af3b565e5ee830f7ed8e844d89237938f96
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k SHELL=/bin/bash drivers/video/fbdev/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202303070108.gtLwdySM-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/video/fbdev/amifb.c: In function 'ami_decode_var':
drivers/video/fbdev/amifb.c:1134:23: warning: variable 'vtotal' set but not used [-Wunused-but-set-variable]
1134 | u_int htotal, vtotal;
| ^~~~~~
drivers/video/fbdev/amifb.c:1134:15: warning: variable 'htotal' set but not used [-Wunused-but-set-variable]
1134 | u_int htotal, vtotal;
| ^~~~~~
drivers/video/fbdev/amifb.c: In function 'ami_get_var_cursorinfo':
drivers/video/fbdev/amifb.c:1855:19: warning: variable 'alloc' set but not used [-Wunused-but-set-variable]
1855 | int size, alloc;
| ^~~~~
drivers/video/fbdev/amifb.c: In function 'amifb_setup':
>> drivers/video/fbdev/amifb.c:2362:51: warning: passing argument 1 of 'amifb_setup_mcap' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2362 | amifb_setup_mcap(this_opt + 11);
| ~~~~~~~~~^~~~
drivers/video/fbdev/amifb.c:2312:43: note: expected 'char *' but argument is of type 'const char *'
2312 | static void __init amifb_setup_mcap(char *spec)
| ~~~~~~^~~~
vim +2362 drivers/video/fbdev/amifb.c
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2348
0b2c4af3b565e5e drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2349 static int __init amifb_setup(const char *options)
^1da177e4c3f415 drivers/video/amifb.c Linus Torvalds 2005-04-16 2350 {
0b2c4af3b565e5e drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2351 struct option_iter iter;
0b2c4af3b565e5e drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2352 const char *this_opt;
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2353
0b2c4af3b565e5e drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2354 option_iter_init(&iter, options);
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2355
0b2c4af3b565e5e drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2356 while (option_iter_next(&iter, this_opt)) {
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2357 if (!strcmp(this_opt, "inverse")) {
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2358 fb_invert_cmaps();
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2359 } else if (!strcmp(this_opt, "ilbm"))
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2360 amifb_ilbm = 1;
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2361 else if (!strncmp(this_opt, "monitorcap:", 11))
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 @2362 amifb_setup_mcap(this_opt + 11);
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2363 else if (!strncmp(this_opt, "fstart:", 7))
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2364 min_fstrt = simple_strtoul(this_opt + 7, NULL, 0);
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2365 else {
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2366 static char mode_option_buf[256];
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2367 int ret;
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2368
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2369 ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", this_opt);
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2370 if (WARN(ret < 0, "amifb: ignoring invalid option, ret=%d\n", ret))
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2371 continue;
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2372 if (WARN(ret >= sizeof(mode_option_buf), "amifb: option too long\n"))
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2373 continue;
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2374 mode_option = mode_option_buf;
d3d9f26ac65b035 drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2375 }
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2376 }
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2377
0b2c4af3b565e5e drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2378 option_iter_release(&iter);
0b2c4af3b565e5e drivers/video/fbdev/amifb.c Thomas Zimmermann 2023-03-06 2379
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2380 if (min_fstrt < 48)
f1cbb17ac739932 drivers/video/amifb.c Geert Uytterhoeven 2011-11-21 2381 min_fstrt = 48;
^1da177e4c3f415 drivers/video/amifb.c Linus Torvalds 2005-04-16 2382
^1da177e4c3f415 drivers/video/amifb.c Linus Torvalds 2005-04-16 2383 return 0;
^1da177e4c3f415 drivers/video/amifb.c Linus Torvalds 2005-04-16 2384 }
195197f408567b5 drivers/video/fbdev/amifb.c Randy Dunlap 2018-07-31 2385 #endif
^1da177e4c3f415 drivers/video/amifb.c Linus Torvalds 2005-04-16 2386
diff --git a/drivers/video/fbdev/amifb.c b/drivers/video/fbdev/amifb.c index 6edfd0bfdd57..b968cf2c5f06 100644 --- a/drivers/video/fbdev/amifb.c +++ b/drivers/video/fbdev/amifb.c @@ -40,6 +40,7 @@ * for more details. */ +#include <linux/cmdline.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h> @@ -2345,16 +2346,14 @@ static void __init amifb_setup_mcap(char *spec) amifb_vfmax = vmax; } -static int __init amifb_setup(char *options) +static int __init amifb_setup(const char *options) { - char *this_opt; + struct option_iter iter; + const char *this_opt; - if (!options || !*options) - return 0; + option_iter_init(&iter, options); - while ((this_opt = strsep(&options, ",")) != NULL) { - if (!*this_opt) - continue; + while (option_iter_next(&iter, this_opt)) { if (!strcmp(this_opt, "inverse")) { fb_invert_cmaps(); } else if (!strcmp(this_opt, "ilbm")) @@ -2376,6 +2375,8 @@ static int __init amifb_setup(char *options) } } + option_iter_release(&iter); + if (min_fstrt < 48) min_fstrt = 48;
Use struct option_iter to walk over the individual options in the driver's option string. Replaces the hand-written strsep() loop with a clean interface. The helpers for struct option_iter handle empty option strings and empty options transparently. The struct's _init and _release functions duplicate and release the option string's memory buffer as needed. Done in preparation of constifying the option string. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/video/fbdev/amifb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)