fix CONFIG REWRITE breaks configuration

  reported as https://github.com/redis/redis/issues/14404
  using patch from https://github.com/redis/redis/pull/14407

2 files changed, 137 insertions, 1 deletions

diff --git a/redis-loadmod.patch b/redis-loadmod.patch
new file mode 100644
index 0000000..70d6664
--- /dev/null
+++ b/redis-loadmod.patch
@@ -0,0 +1,128 @@
+From 7ef0383905b75f070a0d9cbfc1bd47d773a44d3d Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Sat, 4 Oct 2025 11:02:35 +0200
+Subject: [PATCH] Fix #14404 don't add loadmodule when from config
+
+---
+ src/config.c |  3 +++
+ src/module.c | 16 +++++++++-------
+ src/server.h |  5 +++--
+ 3 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index 2606d065027..973a31a5100 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -362,6 +362,7 @@ void queueLoadModule(sds path, sds *argv, int argc) {
+     loadmod->argv = argc ? zmalloc(sizeof(robj*)*argc) : NULL;
+     loadmod->path = sdsnew(path);
+     loadmod->argc = argc;
++    loadmod->conf = 1;
+     for (i = 0; i < argc; i++) {
+         loadmod->argv[i] = createRawStringObject(argv[i],sdslen(argv[i]));
+     }
+@@ -1570,6 +1571,8 @@ void rewriteConfigLoadmoduleOption(struct rewriteConfigState *state) {
+         struct RedisModule *module = dictGetVal(de);
+         /* Internal modules doesn't have path and are not part of the configuration file */
+         if (sdslen(module->loadmod->path) == 0) continue;
++        /* ignore when loaded from config */
++        if (module->loadmod->conf) continue;
+ 
+         line = sdsnew("loadmodule ");
+         line = sdscatsds(line, module->loadmod->path);
+diff --git a/src/module.c b/src/module.c
+index ab8cafb191a..2d3b8a4eb3e 100644
+--- a/src/module.c
++++ b/src/module.c
+@@ -12333,7 +12333,7 @@ int VectorSets_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc);
+ /* Load internal data types that bundled as modules */
+ void moduleLoadInternalModules(void) {
+ #ifdef INCLUDE_VEC_SETS
+-    int retval = moduleOnLoad((int (*)(void *, void **, int)) VectorSets_OnLoad, NULL, NULL, NULL, 0, 0);
++    int retval = moduleOnLoad((int (*)(void *, void **, int)) VectorSets_OnLoad, NULL, NULL, NULL, 0, 0, 1);
+     serverAssert(retval == C_OK);
+ #endif
+ }
+@@ -12354,7 +12354,7 @@ void moduleLoadFromQueue(void) {
+     listRewind(server.loadmodule_queue,&li);
+     while((ln = listNext(&li))) {
+         struct moduleLoadQueueEntry *loadmod = ln->value;
+-        if (moduleLoad(loadmod->path,(void **)loadmod->argv,loadmod->argc, 0)
++        if (moduleLoad(loadmod->path,(void **)loadmod->argv, loadmod->argc, 0, loadmod->conf)
+             == C_ERR)
+         {
+             serverLog(LL_WARNING,
+@@ -12543,7 +12543,7 @@ void moduleUnregisterCleanup(RedisModule *module) {
+ 
+ /* Load a module by path 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 is_config) {
+     int (*onload)(void *, void **, int);
+     void *handle;
+ 
+@@ -12570,12 +12570,12 @@ int moduleLoad(const char *path, void **module_argv, int module_argc, int is_loa
+         return C_ERR;
+     }
+ 
+-    return moduleOnLoad(onload, path, handle, module_argv, module_argc, is_loadex);
++    return moduleOnLoad(onload, path, handle, module_argv, module_argc, is_loadex, is_config);
+ }
+ 
+ /* Load a module by its 'onload' callback and initialize it. On success C_OK is returned, otherwise
+  * C_ERR is returned. */
+-int moduleOnLoad(int (*onload)(void *, void **, int), const char *path, void *handle, void **module_argv, int module_argc, int is_loadex) {
++int moduleOnLoad(int (*onload)(void *, void **, int), const char *path, void *handle, void **module_argv, int module_argc, int is_loadex, int is_config) {
+     RedisModuleCtx ctx;
+     moduleCreateContext(&ctx, NULL, REDISMODULE_CTX_TEMP_CLIENT); /* We pass NULL since we don't have a module yet. */
+     if (onload((void*)&ctx,module_argv,module_argc) == REDISMODULE_ERR) {
+@@ -12599,6 +12599,8 @@ int moduleOnLoad(int (*onload)(void *, void **, int), const char *path, void *ha
+     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->conf = is_config;
++
+     for (int i = 0; i < module_argc; i++) {
+         ctx.module->loadmod->argv[i] = module_argv[i];
+         incrRefCount(ctx.module->loadmod->argv[i]);
+@@ -13910,7 +13912,7 @@ NULL
+             argv = &c->argv[3];
+         }
+ 
+-        if (moduleLoad(c->argv[2]->ptr,(void **)argv,argc, 0) == C_OK)
++        if (moduleLoad(c->argv[2]->ptr,(void **)argv,argc, 0, 0) == C_OK)
+             addReply(c,shared.ok);
+         else
+             addReplyError(c,
+@@ -13926,7 +13928,7 @@ NULL
+         /* 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((RedisModuleString ***) &argv, &argc) == REDISMODULE_OK &&
+-            moduleLoad(c->argv[2]->ptr, (void **)argv, argc, 1) == C_OK)
++            moduleLoad(c->argv[2]->ptr, (void **)argv, argc, 1, 0) == C_OK)
+             addReply(c,shared.ok);
+         else {
+             dictEmpty(server.module_configs_queue, NULL);
+diff --git a/src/server.h b/src/server.h
+index a5cf8a73fe0..d724f09e193 100644
+--- a/src/server.h
++++ b/src/server.h
+@@ -1499,6 +1499,7 @@ struct saveparam {
+ 
+ struct moduleLoadQueueEntry {
+     sds path;
++    int conf;
+     int argc;
+     robj **argv;
+ };
+@@ -2745,8 +2746,8 @@ void populateCommandLegacyRangeSpec(struct redisCommand *c);
+ void moduleInitModulesSystem(void);
+ void moduleInitModulesSystemLast(void);
+ void modulesCron(void);
+-int moduleOnLoad(int (*onload)(void *, void **, int), const char *path, void *handle, void **module_argv, int module_argc, int is_loadex);
+-int moduleLoad(const char *path, void **argv, int argc, int is_loadex);
++int moduleOnLoad(int (*onload)(void *, void **, int), const char *path, void *handle, void **module_argv, int module_argc, int is_loadex, int is_config);
++int moduleLoad(const char *path, void **argv, int argc, int is_loadex, int is_config);
+ int moduleUnload(sds name, const char **errmsg, int forced_unload);
+ void moduleLoadInternalModules(void);
+ void moduleLoadFromQueue(void);
diff --git a/redis.spec b/redis.spec
index 6372ecc..b1f9030 100644
--- a/redis.spec
+++ b/redis.spec
@@ -22,7 +22,7 @@
 
 Name:              redis
 Version:           %{upstream_ver}
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A persistent key-value database
 # redis: RSALv2 or SSPLv1 or AGPLv3 (only AGPLv3 is OSS)
 # hiredis: BSD-3-Clause
@@ -41,6 +41,8 @@ Source5:           %{name}.tmpfiles
 
 # Fix default paths in configuration files for RPM layout
 Patch0:            %{name}-conf.patch
+# Workaround to https://github.com/redis/redis/issues/14404
+Patch1:            %{name}-loadmod.patch
 
 BuildRequires:     gcc
 BuildRequires:     gcc-c++
@@ -129,6 +131,7 @@ API documentation is available in the redis-doc package.
 %prep
 %setup -q -n %{name}-%{upstream_ver}
 %patch -P0 -p1 -b .old
+%patch -P1 -p1 -b .loadmod
 
 %if %{with jemalloc}
 rm -frv deps/jemalloc
@@ -325,6 +328,11 @@ fi
 
 
 %changelog
+* Sun Oct  5 2025 Remi Collet <remi@remirepo.net> - 8.2.2-2
+- fix CONFIG REWRITE breaks configuration
+  reported as https://github.com/redis/redis/issues/14404
+  using patch from https://github.com/redis/redis/pull/14407
+
 * Fri Oct  3 2025 Remi Collet <remi@remirepo.net> - 8.2.2-1
 - Redis 8.2.2 Released Fri 3 Oct 2025 10:00:00 IST
 - Update urgency: SECURITY: