The firmware filename macros incorrectly included semicolons in their
string literal definitions. Right now, this wasn't causing any real
problem, but coming changes to the MODULE_INFO() macro make this more
sensitive. Specifically, when used with MODULE_FIRMWARE(), this
created syntax errors during macro expansion:
MODULE_FIRMWARE(LME2510_C_S7395);
expands to:
MODULE_INFO(firmware, "dvb-usb-lme2510c-s7395.fw";)
^
syntax error
Remove the trailing semicolons from all six firmware filename macro
definitions. Semicolons should only appear at the point of use, not in
the macro definition.
Reviewed-by: Hans Verkuil <hverkuil+cisco@kernel.org>
Signed-off-by: Kees Cook <kees@kernel.org>
---
Cc: Malcolm Priestley <tvboxspy@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: <linux-media@vger.kernel.org>
---
drivers/media/usb/dvb-usb-v2/lmedm04.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
index 0c510035805b..05c18b6de5c6 100644
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
@@ -70,12 +70,12 @@
#include "ts2020.h"
-#define LME2510_C_S7395 "dvb-usb-lme2510c-s7395.fw";
-#define LME2510_C_LG "dvb-usb-lme2510c-lg.fw";
-#define LME2510_C_S0194 "dvb-usb-lme2510c-s0194.fw";
-#define LME2510_C_RS2000 "dvb-usb-lme2510c-rs2000.fw";
-#define LME2510_LG "dvb-usb-lme2510-lg.fw";
-#define LME2510_S0194 "dvb-usb-lme2510-s0194.fw";
+#define LME2510_C_S7395 "dvb-usb-lme2510c-s7395.fw"
+#define LME2510_C_LG "dvb-usb-lme2510c-lg.fw"
+#define LME2510_C_S0194 "dvb-usb-lme2510c-s0194.fw"
+#define LME2510_C_RS2000 "dvb-usb-lme2510c-rs2000.fw"
+#define LME2510_LG "dvb-usb-lme2510-lg.fw"
+#define LME2510_S0194 "dvb-usb-lme2510-s0194.fw"
/* debug */
static int dvb_usb_lme2510_debug;
--
2.34.1
Em Thu, 9 Oct 2025 20:06:07 -0700 Kees Cook <kees@kernel.org> escreveu: > The firmware filename macros incorrectly included semicolons in their > string literal definitions. Right now, this wasn't causing any real > problem, but coming changes to the MODULE_INFO() macro make this more > sensitive. Specifically, when used with MODULE_FIRMWARE(), this > created syntax errors during macro expansion: > > MODULE_FIRMWARE(LME2510_C_S7395); > > expands to: > > MODULE_INFO(firmware, "dvb-usb-lme2510c-s7395.fw";) > ^ > syntax error > > Remove the trailing semicolons from all six firmware filename macro > definitions. Semicolons should only appear at the point of use, not in > the macro definition. > > Reviewed-by: Hans Verkuil <hverkuil+cisco@kernel.org> > Signed-off-by: Kees Cook <kees@kernel.org> LGTM. Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > Cc: Malcolm Priestley <tvboxspy@gmail.com> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Cc: <linux-media@vger.kernel.org> > --- > drivers/media/usb/dvb-usb-v2/lmedm04.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c > index 0c510035805b..05c18b6de5c6 100644 > --- a/drivers/media/usb/dvb-usb-v2/lmedm04.c > +++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c > @@ -70,12 +70,12 @@ > #include "ts2020.h" > > > -#define LME2510_C_S7395 "dvb-usb-lme2510c-s7395.fw"; > -#define LME2510_C_LG "dvb-usb-lme2510c-lg.fw"; > -#define LME2510_C_S0194 "dvb-usb-lme2510c-s0194.fw"; > -#define LME2510_C_RS2000 "dvb-usb-lme2510c-rs2000.fw"; > -#define LME2510_LG "dvb-usb-lme2510-lg.fw"; > -#define LME2510_S0194 "dvb-usb-lme2510-s0194.fw"; > +#define LME2510_C_S7395 "dvb-usb-lme2510c-s7395.fw" > +#define LME2510_C_LG "dvb-usb-lme2510c-lg.fw" > +#define LME2510_C_S0194 "dvb-usb-lme2510c-s0194.fw" > +#define LME2510_C_RS2000 "dvb-usb-lme2510c-rs2000.fw" > +#define LME2510_LG "dvb-usb-lme2510-lg.fw" > +#define LME2510_S0194 "dvb-usb-lme2510-s0194.fw" > > /* debug */ > static int dvb_usb_lme2510_debug;
© 2016 - 2025 Red Hat, Inc.