summaryrefslogtreecommitdiffstats
path: root/valkey-loadmod.patch
diff options
context:
space:
mode:
Diffstat (limited to 'valkey-loadmod.patch')
-rw-r--r--valkey-loadmod.patch128
1 files changed, 61 insertions, 67 deletions
diff --git a/valkey-loadmod.patch b/valkey-loadmod.patch
index 74c016e..5fcd2f0 100644
--- a/valkey-loadmod.patch
+++ b/valkey-loadmod.patch
@@ -1,23 +1,7 @@
-From cae829f497550d175331d3d6cd0bbf4aed0965a4 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Sat, 4 Oct 2025 07:23:52 +0200
-Subject: [PATCH] Fix #2678 don't add loadmodule when from config
-
-only protect loadmodule from include files
-
-Signed-off-by: Remi Collet <remi@remirepo.net>
----
- src/config.c | 8 ++++++--
- src/module.c | 17 ++++++++++++-----
- src/module.h | 4 ++--
- src/server.c | 2 +-
- 4 files changed, 21 insertions(+), 10 deletions(-)
-
-diff --git a/src/config.c b/src/config.c
-index 93ef289e3..dc4116383 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -450,6 +450,8 @@ static int updateClientOutputBufferLimit(sds *args, int arg_len, const char **er
+diff -up ./src/config.c.loadmod ./src/config.c
+--- ./src/config.c.loadmod 2026-04-28 18:32:37.000000000 +0200
++++ ./src/config.c 2026-04-29 09:34:55.668568785 +0200
+@@ -455,6 +455,8 @@ static int updateClientOutputBufferLimit
* within conf file parsing. This is only needed to support the deprecated
* abnormal aggregate `save T C` functionality. Remove in the future. */
static int reading_config_file;
@@ -26,7 +10,7 @@ index 93ef289e3..dc4116383 100644
void loadServerConfigFromString(sds config) {
deprecatedConfig deprecated_configs[] = {
-@@ -541,7 +543,9 @@ void loadServerConfigFromString(sds config) {
+@@ -547,7 +549,9 @@ void loadServerConfigFromString(sds conf
/* Execute config directives */
if (!strcasecmp(argv[0], "include") && argc == 2) {
@@ -36,7 +20,7 @@ index 93ef289e3..dc4116383 100644
} else if (!strcasecmp(argv[0], "rename-command") && argc == 3) {
struct serverCommand *cmd = lookupCommandBySds(argv[1]);
-@@ -574,7 +578,7 @@ void loadServerConfigFromString(sds config) {
+@@ -580,7 +584,7 @@ void loadServerConfigFromString(sds conf
goto loaderr;
}
} else if (!strcasecmp(argv[0], "loadmodule") && argc >= 2) {
@@ -45,20 +29,19 @@ index 93ef289e3..dc4116383 100644
} else if (strchr(argv[0], '.')) {
if (argc < 2) {
err = "Module config specified without value";
-@@ -1618,7 +1622,7 @@ void rewriteConfigLoadmoduleOption(struct rewriteConfigState *state) {
- while ((de = dictNext(di)) != NULL) {
+@@ -1625,7 +1629,7 @@ void rewriteConfigLoadmoduleOption(struc
struct ValkeyModule *module = dictGetVal(de);
+ if (module->is_static_module) continue;
line = moduleLoadQueueEntryToLoadmoduleOptionStr(module, "loadmodule");
- rewriteConfigRewriteLine(state, "loadmodule", line, 1);
+ if (line) rewriteConfigRewriteLine(state, "loadmodule", line, 1);
}
dictReleaseIterator(di);
/* Mark "loadmodule" as processed in case modules is empty. */
-diff --git a/src/module.c b/src/module.c
-index de5a5510e..2638268e1 100644
---- a/src/module.c
-+++ b/src/module.c
-@@ -84,6 +84,7 @@
+diff -up ./src/module.c.loadmod ./src/module.c
+--- ./src/module.c.loadmod 2026-04-28 18:32:37.000000000 +0200
++++ ./src/module.c 2026-04-29 09:47:30.216571253 +0200
+@@ -83,6 +83,7 @@
struct moduleLoadQueueEntry {
sds path;
@@ -75,7 +58,7 @@ index de5a5510e..2638268e1 100644
int i;
struct moduleLoadQueueEntry *loadmod;
-@@ -687,6 +688,7 @@ void moduleEnqueueLoadModule(sds path, sds *argv, int argc) {
+@@ -687,6 +688,7 @@ void moduleEnqueueLoadModule(sds path, s
loadmod->argv = argc ? zmalloc(sizeof(robj *) * argc) : NULL;
loadmod->path = sdsnew(path);
loadmod->argc = argc;
@@ -83,7 +66,7 @@ index de5a5510e..2638268e1 100644
for (i = 0; i < argc; i++) {
loadmod->argv[i] = createRawStringObject(argv[i], sdslen(argv[i]));
}
-@@ -697,6 +699,10 @@ sds moduleLoadQueueEntryToLoadmoduleOptionStr(ValkeyModule *module,
+@@ -697,6 +699,10 @@ sds moduleLoadQueueEntryToLoadmoduleOpti
const char *config_option_str) {
sds line;
@@ -94,7 +77,7 @@ index de5a5510e..2638268e1 100644
line = sdsnew(config_option_str);
line = sdscatlen(line, " ", 1);
line = sdscatsds(line, module->loadmod->path);
-@@ -12629,7 +12635,7 @@ void moduleLoadFromQueue(void) {
+@@ -13148,7 +13154,7 @@ void moduleLoadFromQueue(void) {
listRewind(server.loadmodule_queue, &li);
while ((ln = listNext(&li))) {
struct moduleLoadQueueEntry *loadmod = ln->value;
@@ -103,24 +86,51 @@ index de5a5510e..2638268e1 100644
serverLog(LL_WARNING, "Can't load module from %s: server aborting", loadmod->path);
exit(1);
}
-@@ -12818,7 +12824,7 @@ void moduleUnregisterCleanup(ValkeyModule *module) {
+@@ -13346,7 +13352,7 @@ static int moduleInitPostOnLoadResolved(
+ void **module_argv,
+ int module_argc,
+ int is_loadex,
+- int is_static) {
++ int is_static, int from_include) {
+ ValkeyModuleCtx ctx;
+ moduleCreateContext(&ctx, NULL, VALKEYMODULE_CTX_TEMP_CLIENT); /* We pass NULL since we don't have a module yet. */
+ if (onload((void *)&ctx, module_argv, module_argc) == VALKEYMODULE_ERR) {
+@@ -13383,6 +13389,7 @@ static int moduleInitPostOnLoadResolved(
+ ctx.module->loadmod->path = sdsnew(display_name);
+ ctx.module->loadmod->argv = module_argc ? zmalloc(sizeof(robj *) * module_argc) : NULL;
+ ctx.module->loadmod->argc = module_argc;
++ ctx.module->loadmod->from_include = from_include;
+ for (int i = 0; i < module_argc; i++) {
+ ctx.module->loadmod->argv[i] = module_argv[i];
+ incrRefCount(ctx.module->loadmod->argv[i]);
+@@ -13427,7 +13434,7 @@ static int moduleInitPostOnLoadResolved(
/* Load a module and initialize it. On success C_OK is returned, otherwise
* C_ERR is returned. */
-int moduleLoad(const char *path, void **module_argv, int module_argc, int is_loadex) {
+int moduleLoad(const char *path, void **module_argv, int module_argc, int is_loadex, int from_include) {
- int (*onload)(void *, void **, int);
+ ModuleLoadFunc onload;
void *handle;
-@@ -12893,6 +12899,7 @@ int moduleLoad(const char *path, void **module_argv, int module_argc, int is_loa
- ctx.module->loadmod->path = sdsnew(path);
- ctx.module->loadmod->argv = module_argc ? zmalloc(sizeof(robj *) * module_argc) : NULL;
- ctx.module->loadmod->argc = module_argc;
-+ ctx.module->loadmod->from_include = from_include;
- for (int i = 0; i < module_argc; i++) {
- ctx.module->loadmod->argv[i] = module_argv[i];
- incrRefCount(ctx.module->loadmod->argv[i]);
-@@ -13961,7 +13968,7 @@ void moduleCommand(client *c) {
+@@ -13476,7 +13483,7 @@ int moduleLoad(const char *path, void **
+ path);
+ return C_ERR;
+ }
+- return moduleInitPostOnLoadResolved(onload, handle, path, module_argv, module_argc, is_loadex, 0);
++ return moduleInitPostOnLoadResolved(onload, handle, path, module_argv, module_argc, is_loadex, 0, from_include);
+ }
+
+ /* Resolve a symbol from a statically linked module. The symbol is looked up
+@@ -13542,7 +13549,7 @@ int moduleLoadStatic(const char *module_
+ return C_ERR;
+ }
+ return moduleInitPostOnLoadResolved(onload, handle, module_name, module_argv, module_argc,
+- is_loadex, 1);
++ is_loadex, 1, 1);
+ }
+
+ static int moduleUnloadInternal(struct ValkeyModule *module, const char **errmsg) {
+@@ -14582,7 +14589,7 @@ void moduleCommand(client *c) {
argv = &c->argv[3];
}
@@ -129,7 +139,7 @@ index de5a5510e..2638268e1 100644
addReply(c, shared.ok);
else
addReplyError(c, "Error loading the extension. Please check the server logs.");
-@@ -13976,7 +13983,7 @@ void moduleCommand(client *c) {
+@@ -14597,7 +14604,7 @@ void moduleCommand(client *c) {
/* If this is a loadex command we want to populate server.module_configs_queue with
* sds NAME VALUE pairs. We also want to increment argv to just after ARGS, if supplied. */
if (parseLoadexArguments((ValkeyModuleString ***)&argv, &argc) == VALKEYMODULE_OK &&
@@ -138,11 +148,10 @@ index de5a5510e..2638268e1 100644
addReply(c, shared.ok);
else {
dictEmpty(server.module_configs_queue, NULL);
-diff --git a/src/module.h b/src/module.h
-index c7ad384c6..3b12efbaf 100644
---- a/src/module.h
-+++ b/src/module.h
-@@ -169,7 +169,7 @@ static inline void moduleInitDigestContext(ValkeyModuleDigest *mdvar) {
+diff -up ./src/module.h.loadmod ./src/module.h
+--- ./src/module.h.loadmod 2026-04-28 18:32:37.000000000 +0200
++++ ./src/module.h 2026-04-29 09:35:56.783998866 +0200
+@@ -174,7 +174,7 @@ static inline void moduleInitDigestConte
memset(mdvar->x, 0, sizeof(mdvar->x));
}
@@ -151,28 +160,13 @@ index c7ad384c6..3b12efbaf 100644
sds moduleLoadQueueEntryToLoadmoduleOptionStr(ValkeyModule *module,
const char *config_option_str);
ValkeyModuleCtx *moduleAllocateContext(void);
-@@ -181,7 +181,7 @@ void moduleFreeContext(ValkeyModuleCtx *ctx);
+@@ -186,7 +186,7 @@ void moduleFreeContext(ValkeyModuleCtx *
void moduleInitModulesSystem(void);
void moduleInitModulesSystemLast(void);
void modulesCron(void);
-int moduleLoad(const char *path, void **argv, int argc, int is_loadex);
+int moduleLoad(const char *path, void **argv, int argc, int is_loadex, int from_include);
+ int moduleLoadStatic(const char *path, void **argv, int argc, int is_loadex);
int moduleUnload(sds name, const char **errmsg);
void moduleUnloadAllModules(void);
- void moduleLoadFromQueue(void);
-diff --git a/src/server.c b/src/server.c
-index 881d83bad..a21d3ca9e 100644
---- a/src/server.c
-+++ b/src/server.c
-@@ -7630,7 +7630,7 @@ __attribute__((weak)) int main(int argc, char **argv) {
- #ifdef LUA_ENABLED
- #define LUA_LIB_STR STRINGIFY(LUA_LIB)
- if (scriptingEngineManagerFind("lua") == NULL) {
-- if (moduleLoad(LUA_LIB_STR, NULL, 0, 0) != C_OK) {
-+ if (moduleLoad(LUA_LIB_STR, NULL, 0, 0, 1) != C_OK) {
- serverPanic("Lua engine initialization failed, check the server logs.");
- }
- }
---
-2.53.0
-
+diff -up ./src/server.c.loadmod ./src/server.c
generated by cgit (git 2.34.1) at 2026-05-01 17:42:21 +0000