diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2024-09-10 13:49:53 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-09-10 13:49:53 +0200 |
| commit | 2f7eedca6cecbfad52d5b52c1550066d9252c947 (patch) | |
| tree | ffce8be3ceee2c845a951d11b99578ca468639a4 /drivers/input/input-mt.c | |
| parent | treewide: Fix wrong singular form of jiffies in comments (diff) | |
| parent | Linux 6.11-rc7 (diff) | |
| download | linux-2f7eedca6cecbfad52d5b52c1550066d9252c947.tar.xz linux-2f7eedca6cecbfad52d5b52c1550066d9252c947.zip | |
Merge branch 'linus' into timers/core
To update with the latest fixes.
Diffstat (limited to 'drivers/input/input-mt.c')
| -rw-r--r-- | drivers/input/input-mt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c index 14b53dac1253..6b04a674f832 100644 --- a/drivers/input/input-mt.c +++ b/drivers/input/input-mt.c @@ -46,6 +46,9 @@ int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots, return 0; if (mt) return mt->num_slots != num_slots ? -EINVAL : 0; + /* Arbitrary limit for avoiding too large memory allocation. */ + if (num_slots > 1024) + return -EINVAL; mt = kzalloc(struct_size(mt, slots, num_slots), GFP_KERNEL); if (!mt) |