]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tee: fix tee_ioctl_object_invoke_arg padding
authorArnd Bergmann <arnd@arndb.de>
Thu, 4 Dec 2025 10:17:23 +0000 (11:17 +0100)
committerJens Wiklander <jens.wiklander@linaro.org>
Wed, 20 May 2026 06:49:09 +0000 (08:49 +0200)
The tee_ioctl_object_invoke_arg structure has padding on some
architectures but not on x86-32 and a few others:

include/linux/tee.h:474:32: error: padding struct to align 'params' [-Werror=padded]

I expect that all current users of this are on architectures that do
have implicit padding here (arm64, arm, x86, riscv), so make the padding
explicit in order to avoid surprises if this later gets used elsewhere.

Fixes: d5b8b0fa1775 ("tee: add TEE_IOCTL_PARAM_ATTR_TYPE_OBJREF")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Tested-by: Harshal Dev <harshal.dev@oss.qualcomm.com>
Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
include/uapi/linux/tee.h

index cab5cadca8ef993c75f7c3c3d548d38de215f159..5203977ed35d1d4d2d8254d111c904bce972ed72 100644 (file)
@@ -470,6 +470,7 @@ struct tee_ioctl_object_invoke_arg {
        __u32 op;
        __u32 ret;
        __u32 num_params;
+       __u32 :32;
        /* num_params tells the actual number of element in params */
        struct tee_ioctl_param params[];
 };