summaryrefslogtreecommitdiff
path: root/kernel/trace/trace_probe.c
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2026-06-21 17:05:45 +0200
committerMiquel Raynal <miquel.raynal@bootlin.com>2026-06-21 17:05:45 +0200
commit49420dfdedd676befaa999b165a76d8d7eec4fab (patch)
treeeafef38246f234752ad47e4ff7fb7d55fe6e95eb /kernel/trace/trace_probe.c
parentc10f641fcb04a33da0b6bfc59cdadc250aafeb96 (diff)
parent4f2692a5383e4bdd43ae940cda012360f7217a2d (diff)
downloadlwn-49420dfdedd676befaa999b165a76d8d7eec4fab.tar.gz
lwn-49420dfdedd676befaa999b165a76d8d7eec4fab.zip
Merge tag 'nand/for-7.2' into mtd/next
* Extend SPI NAND continuous read to Winbond devices, which requires numerous changes in the spi-{mem,nand} layers such as the need for a secondary read operation template. * Continuous reads in general have also been enhanced/fixed for avoiding potential issues at probe time and at block boundaries. Plus, there is the usual load of misc fixes and improvements.
Diffstat (limited to 'kernel/trace/trace_probe.c')
-rw-r--r--kernel/trace/trace_probe.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index e1c73065dae5..e0d3a0da26af 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -1523,6 +1523,12 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size,
parg->offset = *size;
*size += parg->type->size * (parg->count ?: 1);
+ if (*size > MAX_PROBE_EVENT_SIZE) {
+ ret = -E2BIG;
+ trace_probe_log_err(ctx->offset, EVENT_TOO_BIG);
+ goto fail;
+ }
+
if (parg->count) {
len = strlen(parg->type->fmttype) + 6;
parg->fmt = kmalloc(len, GFP_KERNEL);