diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-06 21:27:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-06 21:27:05 -0400 |
| commit | 19f516ea34f943edd5bfe9ca0c0050a7660c230c (patch) | |
| tree | 00c8eb2bc5d0f8b43e0ab38eff0fd9a49479e7b5 /include/linux | |
| parent | Merge tag 'erofs-for-6.0-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs (diff) | |
| parent | ARM: 9229/1: amba: Fix use-after-free in amba_read_periphid() (diff) | |
| download | linux-dev-19f516ea34f943edd5bfe9ca0c0050a7660c230c.tar.xz linux-dev-19f516ea34f943edd5bfe9ca0c0050a7660c230c.zip | |
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King:
"Just one fix for now for the AMBA bus code from Isaac Manjarres"
* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 9229/1: amba: Fix use-after-free in amba_read_periphid()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/amba/bus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index e94cdf235f1d..5001e14c5c06 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -67,6 +67,7 @@ struct amba_device { struct clk *pclk; struct device_dma_parameters dma_parms; unsigned int periphid; + struct mutex periphid_lock; unsigned int cid; struct amba_cs_uci_id uci; unsigned int irq[AMBA_NR_IRQS]; |