Commit c84d5746 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull module updates from Daniel Gomez:
 "Rust module parameter support:

   - Add Rust module parameter support, enabling Rust kernel modules to
     declare and use module parameters. The rust_minimal sample module
     demonstrates this, and the rust null block driver will be the first
     to use it in the next cycle. This also adds the Rust module files
     under the modules subsystem as agreed between the Rust and modules
     maintainers.

  Hardening:

   - Add compile-time check for embedded NUL characters in MODULE_*()
     macros. This module metadata was once used (and maybe still) to
     bypass license enforcement (LWN article from 2003):

	https://lwn.net/Articles/82305/ [1]

  MAINTAINERS:

   - Add Aaron Tomlin as reviewer for the Modules subsystem"

* tag 'modules-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux:
  MAINTAINERS: Add myself as reviewer for module support
  module: Add compile-time check for embedded NUL characters
  media: radio: si470x: Fix DRIVER_AUTHOR macro definition
  media: dvb-usb-v2: lmedm04: Fix firmware macro definitions
  modules: add rust modules files to MAINTAINERS
  rust: samples: add a module parameter to the rust_minimal sample
  rust: module: update the module macro with module parameter support
  rust: module: use a reference in macros::module::module
  rust: introduce module_param module
  rust: str: add radix prefixed integer parsing functions
  rust: sync: add `SetOnce`
parents 416f99c3 1ddac5cd
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -17522,6 +17522,7 @@ M: Luis Chamberlain <mcgrof@kernel.org>
M:	Petr Pavlu <petr.pavlu@suse.com>
M:	Daniel Gomez <da.gomez@kernel.org>
R:	Sami Tolvanen <samitolvanen@google.com>
R:	Aaron Tomlin <atomlin@atomlin.com>
L:	linux-modules@vger.kernel.org
L:	linux-kernel@vger.kernel.org
S:	Maintained
@@ -17531,6 +17532,8 @@ F: include/linux/module*.h
F:	kernel/module/
F:	lib/test_kmod.c
F:	lib/tests/module/
F:	rust/kernel/module_param.rs
F:	rust/macros/module.rs
F:	scripts/module*
F:	tools/testing/selftests/kmod/
F:	tools/testing/selftests/module/
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@


/* driver definitions */
#define DRIVER_AUTHOR "Joonyoung Shim <jy0922.shim@samsung.com>";
#define DRIVER_AUTHOR "Joonyoung Shim <jy0922.shim@samsung.com>"
#define DRIVER_CARD "Silicon Labs Si470x FM Radio"
#define DRIVER_DESC "I2C radio driver for Si470x FM Radio Receivers"
#define DRIVER_VERSION "1.0.2"
+6 −6
Original line number Diff line number Diff line
@@ -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;
+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@

/* Generic info of form tag = "info" */
#define MODULE_INFO(tag, info)					  \
	static_assert(						  \
		sizeof(info) - 1 == __builtin_strlen(info),	  \
		"MODULE_INFO(" #tag ", ...) contains embedded NUL byte"); \
	static const char __UNIQUE_ID(modinfo)[]			  \
		__used __section(".modinfo") __aligned(1)		  \
		= __MODULE_INFO_PREFIX __stringify(tag) "=" info
+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@
pub mod maple_tree;
pub mod miscdevice;
pub mod mm;
pub mod module_param;
#[cfg(CONFIG_NET)]
pub mod net;
pub mod num;
Loading