Hello arm-soc maintainers,
Please pull two small small patches for the TEE subsystem and OP-TEE driver.
Thanks, Jens
The following changes since commit 8ffd015db85fea3e15a77027fda6c02ced4d2444:
Linux 6.15-rc2 (2025-04-13 11:54:49 -0700)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tags/tee-for-v6.16
for you to fetch changes up to 39bb67edcc582b3b386a9ec983da67fa8a10ec03:
tee: Prevent size calculation wraparound on 32-bit kernels (2025-04-30 14:57:03 +0200)
---------------------------------------------------------------- Small TEE updates for v6.16
- Remove an unnecessary NULL check before release_firmware() in the OP-TEE driver - Prevent a size wrap in the TEE subsystem. The wrap would have been caught later in the code so no security consequences.
---------------------------------------------------------------- Chen Ni (1): tee: optee: smc: remove unnecessary NULL check before release_firmware()
Jann Horn (1): tee: Prevent size calculation wraparound on 32-bit kernels
drivers/tee/optee/smc_abi.c | 3 +-- drivers/tee/tee_core.c | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
On Fri, May 9, 2025, at 08:51, Jens Wiklander wrote:
Small TEE updates for v6.16
- Remove an unnecessary NULL check before release_firmware() in the OP-TEE driver
- Prevent a size wrap in the TEE subsystem. The wrap would have been caught later in the code so no security consequences.
Chen Ni (1): tee: optee: smc: remove unnecessary NULL check before release_firmware()
Jann Horn (1): tee: Prevent size calculation wraparound on 32-bit kernels
The second patch looks like it should be a bugfix for 6.15 instead, any reason to have it only in 6.16?
Arnd
On Fri, May 9, 2025 at 11:14 PM Arnd Bergmann arnd@arndb.de wrote:
On Fri, May 9, 2025, at 08:51, Jens Wiklander wrote:
Small TEE updates for v6.16
- Remove an unnecessary NULL check before release_firmware() in the OP-TEE driver
- Prevent a size wrap in the TEE subsystem. The wrap would have been caught later in the code so no security consequences.
Chen Ni (1): tee: optee: smc: remove unnecessary NULL check before release_firmware()
Jann Horn (1): tee: Prevent size calculation wraparound on 32-bit kernels
The second patch looks like it should be a bugfix for 6.15 instead, any reason to have it only in 6.16?
FWIW, it's more of a cleanup than a real bugfix; there is an unsigned integer wraparound, but if that occurs, we're guaranteed to hit a memory allocation bailout pretty much immediately afterwards. So I think putting it in 6.16 is reasonable.
On Fri, May 9, 2025, at 23:22, Jann Horn wrote:
On Fri, May 9, 2025 at 11:14 PM Arnd Bergmann arnd@arndb.de wrote:
The second patch looks like it should be a bugfix for 6.15 instead, any reason to have it only in 6.16?
FWIW, it's more of a cleanup than a real bugfix; there is an unsigned integer wraparound, but if that occurs, we're guaranteed to hit a memory allocation bailout pretty much immediately afterwards. So I think putting it in 6.16 is reasonable.
Ok, I see. Merged now.
Arnd
op-tee@lists.trustedfirmware.org
-
Arnd Bergmann -
Jann Horn -
Jens Wiklander