diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-15 08:36:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-15 08:36:26 -0700 |
| commit | 3eb40771c00a8488fa6ed2cc1fe203477908bf38 (patch) | |
| tree | 922aec7a266981d35502a328027e5f5536d0bde5 /drivers | |
| parent | 5e060ff9d18748dbb21b12b821fcfc738823ba93 (diff) | |
| parent | e36c0670d5ebebd7dba493f14966051f354fbb34 (diff) | |
| download | linux-3eb40771c00a8488fa6ed2cc1fe203477908bf38.tar.gz linux-3eb40771c00a8488fa6ed2cc1fe203477908bf38.zip | |
Pull SoC fixes from Arnd Bergmann:
"These are three last-minute fixes for the 7.2 release, though nothing
alarming:
- one error handling fix for optee firmware
- incorrect i2c data for the apple M3 that was added in 7.2
- a boot time warning fix for nvidia tegra"
* tag 'soc-fixes-7.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
arm64: tegra: Add EL2 virtual timer interrupt for Tegra194
arm64: dts: apple: t8122: Fix I2C resources
optee: ffa: Add NULL check in optee_ffa_lend_protmem
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tee/optee/ffa_abi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index b4372fa268d0..633715b98625 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -698,6 +698,9 @@ static int optee_ffa_lend_protmem(struct optee *optee, struct tee_shm *protmem, int rc; mem_attr = kzalloc_objs(*mem_attr, ma_count); + if (!mem_attr) + return -ENOMEM; + for (n = 0; n < ma_count; n++) { mem_attr[n].receiver = mem_attrs[n] & U16_MAX; mem_attr[n].attrs = mem_attrs[n] >> 16; |