diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-10 00:46:57 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-10 00:46:57 +0300 |
| commit | 6b8bb5b8d9b35fb43f0dbf9fd91b7d35e6232e08 (patch) | |
| tree | eb6702bd1adcebe4e9519f26f922fcda4096018d /arch/sh/boards/mach-kfr2r09 | |
| parent | 1b37a0a2d46f0c5fa5eee170ddeeb83342faa117 (diff) | |
| parent | 246f80a0b17f8f582b2c0996db02998239057c65 (diff) | |
| download | linux-6b8bb5b8d9b35fb43f0dbf9fd91b7d35e6232e08.tar.xz | |
Merge tag 'sh-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh updates from Adrian Glaubitz:
- Fix a use-after-free bug in the push-switch driver (Duoming Zhou)
- Fix calls to dma_declare_coherent_memory() that incorrectly passed
the buffer end address instead of the buffer size as the size
parameter
* tag 'sh-for-v6.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: push-switch: Reorder cleanup operations to avoid use-after-free bug
sh: boards: Fix CEU buffer size passed to dma_declare_coherent_memory()
Diffstat (limited to 'arch/sh/boards/mach-kfr2r09')
| -rw-r--r-- | arch/sh/boards/mach-kfr2r09/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index a18e80394aed..6b775eae85c0 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c @@ -603,7 +603,7 @@ static int __init kfr2r09_devices_setup(void) device_initialize(&kfr2r09_ceu_device.dev); dma_declare_coherent_memory(&kfr2r09_ceu_device.dev, ceu_dma_membase, ceu_dma_membase, - ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1); + CEU_BUFFER_MEMORY_SIZE); platform_device_add(&kfr2r09_ceu_device); |