[PATCH 1/3] depmod: unconditionally write builtin.alias.bin
From: Lucas De Marchi <hidden>
Date: 2020-12-18 16:03:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
The file is always created and unless we return an error, the temporary file is renamed to its final destination. All other places write the index without checking if the index is empty, so just do the same. Reported-by: Joe Buehler <redacted> --- tools/depmod.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/depmod.c b/tools/depmod.c
index 2c03dfe..3f31cdf 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c@@ -2419,7 +2419,7 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) if (ret < 0) { if (ret == -ENOENT) ret = 0; - goto fail; + goto out; } kmod_list_foreach(l, builtin) {
@@ -2429,7 +2429,7 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) ret = kmod_module_get_info(mod, &info_list); if (ret < 0) - goto fail; + goto out; kmod_list_foreach(ll, info_list) { char alias[PATH_MAX];
@@ -2454,9 +2454,11 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) count++; } - if (count) +out: + /* do not bother writing the index if we are going to discard it */ + if (!ret) index_write(idx, out); -fail: + if (builtin) kmod_module_unref_list(builtin);
--
2.29.2