Received-SPF: pass (google.com: domain of linux-kernel+bounces-165621-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Erick Archer <erick.archer@outlook.com>
To: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
	Xin Long <lucien.xin@gmail.com>,
	Kees Cook <keescook@chromium.org>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	Bill Wendling <morbo@google.com>,
	Justin Stitt <justinstitt@google.com>
Cc: Erick Archer <erick.archer@outlook.com>,
	linux-sctp@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-hardening@vger.kernel.org,
	llvm@lists.linux.dev
Subject: [PATCH] sctp: annotate struct sctp_assoc_ids with __counted_by()
Date: Wed,  1 May 2024 19:01:22 +0200
Message-ID:
 <AS8PR02MB723728DA244A82D97342D6498B192@AS8PR02MB7237.eurprd02.prod.outlook.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AS8PR02MB7237:EE_|AS8PR02MB6919:EE_
X-MS-Office365-Filtering-Correlation-Id: 7692cf13-4e20-4313-5678-08dc6a005ed4
X-Microsoft-Antispam:
	BCL:0;ARA:14566002|461199019|440099019|3412199016|1710799017;
X-Microsoft-Antispam-Message-Info:
	IG3AXHgw2lnDYgVMA9e35ggZBdk5uM8AAlF/FkQyJWehhGUA7qTHMStXQSG7in67iY6Z2uC3pslI1xPg40Ndw1C6BI8LohSFDRL0qZ9AB+ksbPMQwpi66DEaAe56wqrjVrXad6pEIq1qSC6q7x4yVegASqPfdgRp36fHiID0Sln4Jx0zMIK2+fC5qYkhzplaFaIBgY8lq7gUOrirCL+4IFgWBZEomIm0+lrE9HRyrpxHqHIQwXOKQTy/T7gLd1c1csQx+7vhCj10hX4HpzsrxzYOU7mQSJlAz9VZoWXB2q8lSE/xS80pkpj9MKd0mODhTiquubbTV4uQF3Nb5r+QWwP+SFlCpVfV++xl3Wz347XXbj1Q5Un3htJNremCfJaga54ZFG7Xr0BqUUkrGJqF89dw5e+lrZXSYJ0l1h7D2cq8ZSxXsyqoFfN18nUpNcdkyT9icE+1wTLEh4qhv7New9Qa8yr0OxZQQ82HuJkyYZQobWVjKy0lLZpjmnPawjOErK8RByTZrre8ubHVGCr1ISQQ6/tL61AVeKlPgqJfvk0s4a44TTY0y2r5xKSkzAt6/c/+4kUwXy8W0TffmxB2sXrdhIheUDnS/shgSHjrgZOaSnpYlnb0M/MsTlylTqU3
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?Tzh4PxgKV0/q3UuDo8LCV7D/INgFcpKruzqxxlQqjzKrJTF0qndO0aqS5HQ8?=
 =?us-ascii?Q?XZ6ob9JRvOAnFoSc2nrdJdEGQEchmneYwjprzYUCVfWuYL2RLxl20/wAoNKv?=
 =?us-ascii?Q?OxrkDsvwQkoVziJEWAma6uWOAHSX/1TwCrVSa/aTzM0BTBM6swXMwqgOSw5b?=
 =?us-ascii?Q?3xyjpSDkpdbe8Qou4G9YHBYs4w2B5Rex7K9+ciGFIZlVcFLdGIG+uK7jCOk/?=
 =?us-ascii?Q?X9Qy+H0UOJCdMzFnn18kL2lB5afBfQ1lCpFTv8Hbt6Jt4FKYyCJS/TQz+CxA?=
 =?us-ascii?Q?hEBJfj9BxCXBG5LeAiC07VsuwxzsA80GdvSkPFiwMQJsIgvQaclZONYdjVRR?=
 =?us-ascii?Q?ocYNmpWCjugLFS6RUHBW+ZC5BS1btRhzPQiUAXz54pZ4mPHIoiSMs1ufaeIx?=
 =?us-ascii?Q?elzU8eG6eANt/WcIC/rNcuB8ISAFRz9m4b3KaZTMJqQTnmi4eu4friFHa2LD?=
 =?us-ascii?Q?E1hMsy5Wg7BKmAlF12/HIOaLeDf8/h+LgcA/qmD0tRU8vn+niP5XkorlrB22?=
 =?us-ascii?Q?1aS8uTOmuA4SvsxE5EzOr2CKf0dLu//Lk9g8qd60jhEEVeBoFlNq/kuqWNOC?=
 =?us-ascii?Q?Us7VmO6JQknBjQVPasrrduGFtPLJgStkRJlbvpXpipDDZyGxm4wN+pti/lst?=
 =?us-ascii?Q?du3PZlKlFbIM/JNiysYfpnw/tLV1npBvKipzhfGFwu2v6cJn4u72KCPQFtM9?=
 =?us-ascii?Q?yNbEqLC0k2W48DLj9azuZJ7hpyiGgG9st239lIsnl4qLU/GgNyNsZUervx5j?=
 =?us-ascii?Q?Zu7kI6T/GTrJE5hw/URMLHw5vUV+87EKAFTdh2Wm/7/HZ0E7DTW1urK/3huG?=
 =?us-ascii?Q?Af5SjP2+4o7g5wqo+rBpR/qPFeB+uJO4mJIkatorvkMgyva0DZmBdIbf3j+B?=
 =?us-ascii?Q?dQD+STl5r+VLm0nO3YXMzejYw2f2yiE7MSZZrprhtYzgbpLuHkU2aQ4bYRiX?=
 =?us-ascii?Q?n/DI5GRD1pBpC74UcfNHrxQYvPS3jewOzjc/HPcB61aK+QmdtDI5DdYT8FrL?=
 =?us-ascii?Q?W8qjLKv4guSqIGe6die3wtTvfQC9S+egivmJ4J3Icw1NzYFk/5vJZH71MA1g?=
 =?us-ascii?Q?bJNycFlWi0QHMf3wbt86R1+4pgupb3evCGYzB8pKQzKWk0EIBPLQWDrNO0Aw?=
 =?us-ascii?Q?f1Q5Hg5i77ODP806HhERHCFcqXYLIGP6OgPkTDbYtMxYk7uI++mfI/D3jsRI?=
 =?us-ascii?Q?Pe9MMuGQawrOMJwOcMIcPIupzt7lKL2roOAm7M7CeBw1cUBbyjitBTg4cpqq?=
 =?us-ascii?Q?Yof2/fID6vAgs3NnIG9d?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7692cf13-4e20-4313-5678-08dc6a005ed4
X-MS-Exchange-CrossTenant-AuthSource: AS8PR02MB7237.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2024 17:01:40.5487
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR02MB6919

Prepare for the coming implementation by GCC and Clang of the
__counted_by attribute. Flexible array members annotated with
__counted_by can have their accesses bounds-checked at run-time via
CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE
(for strcpy/memcpy-family functions).

Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Erick Archer <erick.archer@outlook.com>
---
 include/uapi/linux/sctp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index b7d91d4cf0db..836173e73401 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -1007,7 +1007,7 @@ enum sctp_sstat_state {
  */
 struct sctp_assoc_ids {
 	__u32		gaids_number_of_ids;
-	sctp_assoc_t	gaids_assoc_id[];
+	sctp_assoc_t	gaids_assoc_id[] __counted_by(gaids_number_of_ids);
 };
 
 /*
-- 
2.25.1