From: Lee Jones <lee@kernel.org>
To: lee@kernel.org, Qunqin Zhao <zhaoqunqin@loongson.cn>,
Yinggang Gu <guyinggang@loongson.cn>,
Huacai Chen <chenhuacai@kernel.org>,
linux-crypto@vger.kernel.org, mfd@lists.linux.dev,
linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: [PATCH v2 20/27] mfd: loongson-se: Validate engine ID, DMA buffer size, and IRQ registration
Date: Tue, 27 Oct 2026 09:30:49 +0000 [thread overview]
Message-ID: <20261027093306.2812695-21-lee@kernel.org> (raw)
In-Reply-To: <20261027093306.2812695-1-lee@kernel.org>
Harden input and error checking in loongson_se_init_engine() and
loongson_se_probe():
- Reject out-of-bounds engine IDs and engine 0 in
loongson_se_init_engine() before indexing se->engines.
- Store dmam_size as u32 to match device_property_read_u32() and verify
that it is large enough to hold the command buffers of all engines
within engine 0's data region.
- Propagate negative error codes from platform_irq_count(),
platform_get_irq(), and devm_request_irq() instead of ignoring IRQ
registration failures or masking -EPROBE_DEFER.
Fixes: e551fa3159e3 ("mfd: Add support for Loongson Security Engine chip controller")
Closes: https://sashiko.dev/#/bug/linux-89bf25f5-ecd9-40e3-bb4c-bd26d07c53a1
Cc: stable@vger.kernel.org
Reviewed-by: Qunqin Zhao <zhaoqunqin@loongson.cn>
Signed-off-by: Lee Jones <lee@kernel.org>
---
drivers/mfd/loongson-se.c | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/loongson-se.c b/drivers/mfd/loongson-se.c
index bdbab4b91729..23af05d388aa 100644
--- a/drivers/mfd/loongson-se.c
+++ b/drivers/mfd/loongson-se.c
@@ -26,7 +26,7 @@ struct loongson_se {
struct completion cmd_completion;
void *dmam_base;
- int dmam_size;
+ u32 dmam_size;
struct mutex engine_init_lock;
struct loongson_se_engine engines[SE_ENGINE_MAX];
@@ -101,8 +101,13 @@ EXPORT_SYMBOL_GPL(loongson_se_send_engine_cmd);
struct loongson_se_engine *loongson_se_init_engine(struct device *dev, int id)
{
struct loongson_se *se = dev_get_drvdata(dev);
- struct loongson_se_engine *engine = &se->engines[id];
struct loongson_se_controller_cmd cmd = {};
+ struct loongson_se_engine *engine;
+
+ if (id <= 0 || id >= SE_ENGINE_MAX)
+ return NULL;
+
+ engine = &se->engines[id];
engine->se = se;
engine->id = id;
@@ -186,7 +191,7 @@ static void loongson_se_stop(void *data)
mutex_unlock(&se->engine_init_lock);
}
-static int loongson_se_init(struct loongson_se *se, dma_addr_t addr, int size)
+static int loongson_se_init(struct loongson_se *se, dma_addr_t addr, u32 size)
{
struct loongson_se_controller_cmd cmd = {};
int err;
@@ -249,6 +254,9 @@ static int loongson_se_probe(struct platform_device *pdev)
if (device_property_read_u32(dev, "dmam_size", &se->dmam_size))
return -ENODEV;
+ if ((se->dmam_size / SE_ENGINE_MAX) < (SE_ENGINE_MAX * 2 * SE_ENGINE_CMD_SIZE))
+ return -EINVAL;
+
se->dmam_base = dmam_alloc_coherent(dev, se->dmam_size, &paddr, GFP_KERNEL);
if (!se->dmam_base)
return -ENOMEM;
@@ -258,16 +266,21 @@ static int loongson_se_probe(struct platform_device *pdev)
return PTR_ERR(se->base);
nr_irq = platform_irq_count(pdev);
- if (nr_irq <= 0)
+ if (!nr_irq)
return -ENODEV;
+ if (nr_irq < 0)
+ return nr_irq;
writel(SE_INT_ALL, se->base + SE_S2LINT_CL);
for (i = 0; i < nr_irq; i++) {
irq = platform_get_irq(pdev, i);
+ if (irq < 0)
+ return irq;
+
err = devm_request_irq(dev, irq, se_irq_handler, 0, "loongson-se", se);
if (err)
- dev_err(dev, "failed to request IRQ: %d\n", irq);
+ return dev_err_probe(dev, err, "Failed to request IRQ: %d\n", irq);
}
writel(SE_INT_ALL, se->base + SE_S2LINT_EN);
--
2.56.0.307.g5fe7bd680c-goog
next prev parent reply other threads:[~2026-10-27 10:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-27 9:30 [PATCH v2 00/27] mfd: Assorted resource lifetime, teardown, and error-handling fixes Lee Jones
2026-10-27 9:30 ` [PATCH v2 07/27] mfd: db8500-prcmu: Make AB8500 cell and IRQ resource static Lee Jones
2026-10-27 9:30 ` [PATCH v2 12/27] mfd: twl-core: Clear pm_power_off callback in twl_remove() Lee Jones
2026-10-27 9:30 ` [PATCH v2 13/27] mfd: twl-core: Clear twl_priv pointer on teardown and probe failure Lee Jones
2026-10-28 15:50 ` Andreas Kemnade
2026-10-27 9:30 ` [PATCH v2 14/27] mfd: loongson-se: Check return value of dma_set_mask_and_coherent() Lee Jones
2026-10-27 9:30 ` [PATCH v2 15/27] mfd: loongson-se: Zero-initialise controller command structures Lee Jones
2026-10-27 9:30 ` [PATCH v2 16/27] mfd: loongson-se: Reinitialise completions and wait uninterruptibly for commands Lee Jones
2026-10-27 9:30 ` [PATCH v2 17/27] mfd: loongson-se: Zero-allocate driver data and initialise engine completions in probe Lee Jones
2026-10-27 9:30 ` [PATCH v2 18/27] mfd: loongson-se: Prevent out-of-bounds engine access in se_irq_handler() Lee Jones
2026-10-27 9:30 ` [PATCH v2 19/27] mfd: loongson-se: Stop controller and mask interrupts on teardown and shutdown Lee Jones
2026-10-27 9:30 ` Lee Jones [this message]
2026-10-27 9:30 ` [PATCH v2 21/27] mfd: abx500-core: Unregister device ops on devm release Lee Jones
2026-10-27 9:30 ` [PATCH v2 22/27] mfd: ab8500-core: Register sysfs attribute groups via devm_device_add_group() Lee Jones
2026-10-27 9:30 ` [PATCH v2 23/27] mfd: tps65217: Manage IRQ domain teardown via devres Lee Jones
2026-10-27 9:30 ` [PATCH v2 24/27] mfd: mt6397: Manage IRQ domain lifecycle with devres Lee Jones
2026-10-28 3:45 ` Chen-Yu Tsai
2026-10-27 9:30 ` [PATCH v2 25/27] mfd: mt6397: Unregister PM notifier on probe failure and unbind Lee Jones
2026-10-28 4:15 ` Chen-Yu Tsai
2026-10-27 9:30 ` [PATCH v2 26/27] i2c: cgbc: Propagate hardware errors when polling read status Lee Jones
2026-10-27 9:30 ` [PATCH v2 27/27] mfd: ti_am335x_tscadc: Remove redundant ti_tscadc_dev_get() helper Lee Jones
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=20261027093306.2812695-21-lee@kernel.org \
--to=lee@kernel.org \
--cc=chenhuacai@kernel.org \
--cc=guyinggang@loongson.cn \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mfd@lists.linux.dev \
--cc=stable@vger.kernel.org \
--cc=zhaoqunqin@loongson.cn \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.