From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FB872EEE68; Tue, 16 Jun 2026 15:48:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781624898; cv=none; b=jOJ9cirY4FEvUm1Of8AVK8v4mrcUlhcFntV3RUtzIC+Zd+iEdS7CRv1T7Q4rTPurI3vUP7F4atS/ps2OJ17tF5atlMgriAj0lvMVgb+6ZAHiEN0NVug9G5pg6JLa0ouJyRf3C9IC3BFtN6oJGCduG5R+V9dj95lzLxj2RLtWCLU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781624898; c=relaxed/simple; bh=iiAU40WgVsdFcnxyTvOyu48QIhA+72nTYLeOp76ZpG4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XuxGYQc7ZXtRr5XiejsIJiONyELb6gkEl/+MtlrFfsd/Upha33qoGA1HG4vBYU6viuvlFNpzZLTZkb2GIWPTAZJFkwPS7H6uoVmIvG65YlZNFCbsmSW6v8xGP2ZsCIIFgPGWCQDBcjW6cvgYsH/TV9oNG2N5X4EF7DJoivOiPEs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Qc+yZ1aS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Qc+yZ1aS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33BCA1F000E9; Tue, 16 Jun 2026 15:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781624897; bh=vP9q87hUPamHXKSO9kT4VyiXR8XdPwsHXYE0ciEezyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Qc+yZ1aSNI4n92XJgx2pwjcsYbul0IoMHXkwrT2Hl9URN2PCrxdkxe+nD57/kTqM8 nZT3kCRcWSD5vwl5BSzB3Hji1CEOqxZDK+yhcWjOgu650qg9y8QMsywhwJhuqWryL9 7vkrpOHfQC7nsy0lt+uyH9BlfuIZ7wlrvfPw3rS4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arnd Bergmann , Jens Wiklander , Harshal Dev , Sumit Garg , Sasha Levin Subject: [PATCH 6.18 015/325] tee: fix tee_ioctl_object_invoke_arg padding Date: Tue, 16 Jun 2026 20:26:51 +0530 Message-ID: <20260616145058.563702357@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145057.827196531@linuxfoundation.org> References: <20260616145057.827196531@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann [ Upstream commit c15d7a2a11ea055bcecc0b538ae8ba79475637f9 ] 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 Reviewed-by: Jens Wiklander Tested-by: Harshal Dev Reviewed-by: Sumit Garg Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- include/uapi/linux/tee.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/tee.h b/include/uapi/linux/tee.h index cab5cadca8ef99..5203977ed35d1d 100644 --- a/include/uapi/linux/tee.h +++ b/include/uapi/linux/tee.h @@ -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[]; }; -- 2.53.0