From: Marco Pagani <marpagan@redhat.com>
To: Moritz Fischer <mdf@kernel.org>, Wu Hao <hao.wu@intel.com>,
Xu Yilun <yilun.xu@intel.com>, Tom Rix <trix@redhat.com>
Cc: Marco Pagani <marpagan@redhat.com>,
linux-kernel@vger.kernel.org, linux-fpga@vger.kernel.org,
Jinjie Ruan <ruanjinjie@huawei.com>
Subject: [PATCH 3/4] fpga: add a platform driver to the FPGA Bridge test suite
Date: Tue, 26 Sep 2023 18:39:10 +0200 [thread overview]
Message-ID: <20230926163911.66114-4-marpagan@redhat.com> (raw)
In-Reply-To: <20230926163911.66114-1-marpagan@redhat.com>
Register a minimal platform driver associated with the parent platform
device used for testing to prevent a null-ptr-deref when try_module_get()
is called by __fpga_bridge_get().
Fixes: 9e6823481e5f ("fpga: add an initial KUnit suite for the FPGA Bridge")
Reported-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Marco Pagani <marpagan@redhat.com>
---
drivers/fpga/tests/fpga-bridge-test.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/fpga/tests/fpga-bridge-test.c b/drivers/fpga/tests/fpga-bridge-test.c
index 1d258002cdd7..4bd4ecaa7e90 100644
--- a/drivers/fpga/tests/fpga-bridge-test.c
+++ b/drivers/fpga/tests/fpga-bridge-test.c
@@ -13,6 +13,8 @@
#include <linux/module.h>
#include <linux/types.h>
+#include "fpga-test-helpers.h"
+
struct bridge_stats {
bool enable;
};
@@ -53,7 +55,7 @@ static struct bridge_ctx *register_test_bridge(struct kunit *test)
ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
- ctx->pdev = platform_device_register_simple("bridge_pdev", PLATFORM_DEVID_AUTO, NULL, 0);
+ ctx->pdev = platform_device_register_simple(TEST_PDEV_NAME, PLATFORM_DEVID_AUTO, NULL, 0);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx->pdev);
ctx->bridge = fpga_bridge_register(&ctx->pdev->dev, "Fake FPGA bridge", &fake_bridge_ops,
@@ -144,6 +146,18 @@ static void fpga_bridge_test_get_put_list(struct kunit *test)
unregister_test_bridge(ctx_1);
}
+TEST_PLATFORM_DRIVER(test_platform_driver);
+
+static int fpga_bridge_test_suite_init(struct kunit_suite *suite)
+{
+ return platform_driver_register(&test_platform_driver);
+}
+
+static void fpga_bridge_test_suite_exit(struct kunit_suite *suite)
+{
+ platform_driver_unregister(&test_platform_driver);
+}
+
static int fpga_bridge_test_init(struct kunit *test)
{
test->priv = register_test_bridge(test);
@@ -165,6 +179,8 @@ static struct kunit_case fpga_bridge_test_cases[] = {
static struct kunit_suite fpga_bridge_suite = {
.name = "fpga_bridge",
+ .suite_init = fpga_bridge_test_suite_init,
+ .suite_exit = fpga_bridge_test_suite_exit,
.init = fpga_bridge_test_init,
.exit = fpga_bridge_test_exit,
.test_cases = fpga_bridge_test_cases,
--
2.41.0
next prev parent reply other threads:[~2023-09-26 16:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 16:39 [PATCH 0/4] fpga: add platform drivers to the FPGA KUnit test suites Marco Pagani
2023-09-26 16:39 ` [PATCH 1/4] fpga: add helpers for " Marco Pagani
2023-09-28 16:01 ` Xu Yilun
2023-09-28 17:01 ` Marco Pagani
2023-09-26 16:39 ` [PATCH 2/4] fpga: add a platform driver to the FPGA Manager test suite Marco Pagani
2023-09-27 2:55 ` Ruan Jinjie
2023-09-27 16:56 ` Marco Pagani
2023-09-28 3:41 ` Ruan Jinjie
2023-09-26 16:39 ` Marco Pagani [this message]
2023-09-27 2:52 ` [PATCH 3/4] fpga: add a platform driver to the FPGA Bridge " Ruan Jinjie
2023-09-26 16:39 ` [PATCH 4/4] fpga: add a platform driver to the FPGA Region " Marco Pagani
2023-09-27 2:58 ` Ruan Jinjie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230926163911.66114-4-marpagan@redhat.com \
--to=marpagan@redhat.com \
--cc=hao.wu@intel.com \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=ruanjinjie@huawei.com \
--cc=trix@redhat.com \
--cc=yilun.xu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®