summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-03-30 15:06:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-03-30 15:06:31 -0700
commit57c06b6e1e74b62eabaacacbe40bdb29c7e990eb (patch)
tree0be052b9dbe64c145f35a047ef8b99d8b9ac121c
parent74164d284b2909de0ba13518cc063e9ea9334749 (diff)
parentdc0ce6cc4b133f5f2beb8b47dacae13a7d283c2c (diff)
Merge tag 'modules-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux
Pull module update from Luis Chamberlain: "There is only one patch which qualifies for modules for v5.18-rc1 and its a small fix from Dan Carpenter for lib/test_kmod module. The rest of the changes are too major and landed in modules-testing too late for inclusion. The good news is that most of the major changes for v5.19 is going to be tested very early through linux-next. This simple fix is all we have for modules for v5.18-rc1" * tag 'modules-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux: lib/test: use after free in register_test_dev_kmod()
-rw-r--r--lib/test_kmod.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/test_kmod.c b/lib/test_kmod.c
index ce1589391413..cb800b1d0d99 100644
--- a/lib/test_kmod.c
+++ b/lib/test_kmod.c
@@ -1149,6 +1149,7 @@ static struct kmod_test_device *register_test_dev_kmod(void)
if (ret) {
pr_err("could not register misc device: %d\n", ret);
free_test_dev_kmod(test_dev);
+ test_dev = NULL;
goto out;
}