From patchwork Tue Oct 3 23:17:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 148082 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2409292vqb; Tue, 3 Oct 2023 16:18:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyYm0eZo1e756ghcHZXiUMGZDVF7ejtDXbidMHhjwcGe0+V6HYS2+syflwtTNxG188QFJN X-Received: by 2002:a05:6a20:9382:b0:15d:c274:2eb1 with SMTP id x2-20020a056a20938200b0015dc2742eb1mr932986pzh.10.1696375098169; Tue, 03 Oct 2023 16:18:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696375098; cv=none; d=google.com; s=arc-20160816; b=XXkZGgT0bMNykhzIaPOSEeorAoOG1FDLMJ5R0H+wQ+Lgtqnd2KHbfwG6GNhgGNM4lU jVaygHHCG6L3lUIuhs16YTIAmVV4mYqgQjW7KdPs5GI4N+djacXiP3K5WmU2nqVtx0xA d0NIWYanv+GT+1exbQ0oZixtFm/DqZCxonEgxc1c3gljcRrtYdXE02XijyedyMZaO5Es H0KiRWJQP4s9nAosQ4mMeOVyjznk927EfyPD940TZC0K9bK55khnKBh7RJirbqjYafPG lrf6a3DROxs4TMBRFStqhfWLFImX8bdUIJLEbBIL2tiTCcVjjBBNActx/y1Aw7ZNcAZt D9Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=2hiNsKpT2HKUJ8qI7Tsyk3akcDPzjImS4VdPWR3XZT4=; fh=OTPPh1vJgflzRhdGU2p462f6/vl/238/Z2tiHfwftQA=; b=ra7Uy7CFd4lUasr3qn3f6FUvMD4Hiw+WVIpZTa+8njGsYG9NhjNE2b1w9gXYRlmuGb xp4bwugRpO4iicOy1sGBOy8DLxOorUvMjZDBRLNWbLb1Zx9NnxGkzmtKznPBHU0heeYa AltESfmNryBihA29WxvSrAqI/WOe9mfPVWxefsUvZB2k3TMiFfaaGqLUhBrpCUmdh5wz 0zS8/UbcktfX+tTmiGtHVf4WoZ+qAfns4PDzh3e+l2A3Ubo0dY0IUkIIqDdinO46EU0n CZWuVXBlGlABOoQkjSxhH208S0/y0cWtu22rH4jnyQjDCq7IJZHslh5g49yQwQcn1nWn 8HmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aCSkSkl7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id x184-20020a6386c1000000b00578b6e32b60si2347621pgd.126.2023.10.03.16.18.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 16:18:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aCSkSkl7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 5FA7D8126719; Tue, 3 Oct 2023 16:18:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234190AbjJCXRz (ORCPT + 17 others); Tue, 3 Oct 2023 19:17:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234324AbjJCXRx (ORCPT ); Tue, 3 Oct 2023 19:17:53 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66EAEFA for ; Tue, 3 Oct 2023 16:17:47 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1bdf4752c3cso10720255ad.2 for ; Tue, 03 Oct 2023 16:17:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696375066; x=1696979866; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2hiNsKpT2HKUJ8qI7Tsyk3akcDPzjImS4VdPWR3XZT4=; b=aCSkSkl7sC4BruVJ6KatwzPKc6b7bhrSCn1NnqxhY7YizoiLOdMkWQpvql8jDkQYrm fydN6yVIdM+V5jG3cWusApcaU0lUb6UwTh0zieaICjAG1HrY1YBaeKLHKGW2OXCbvte9 9vWifOlo7S2XBBg5BTp0kWUX4/tUgHyUvUfyU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696375066; x=1696979866; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2hiNsKpT2HKUJ8qI7Tsyk3akcDPzjImS4VdPWR3XZT4=; b=DI3+4WmaHJPkd3nmwPoOmURmL3QhunvHTqpriYpT735jQqKjhhKfpBjPkT23yKrF4d FSLsw7d3IHr6c9IHlIkBo+Tv9TO03Vx0WHEGtcjLlzB4ppFexoZhhGzOUKdgmXuw7V++ n7OCoTr/DoU7Mc/EU10BGvf8tMZbG6ZBvKc5XxakoHoQdaejB4kTXId/yYbMA5hoIBJ7 FPmaHzr6CZg3VP3BZcVTDVsquHcqgqZ8gJtdef9PcCLZV/uW/ASn/0v1voVMs0Txlv4I Rt+vprtogHiLJHQxbKREPQ8ACPSp5IKt2Jtmvv9SE/OTZG2ONq11bm1a2AEiM2lbIKmo wSlQ== X-Gm-Message-State: AOJu0YxunhHSyNJ7cHyubEklYk2N7GbExOqXCW9lzG3h2KuhCwnAVCkU /nviIGNEfFqry6emRXAEYK4cuw== X-Received: by 2002:a17:902:e84e:b0:1c0:d5b1:2de8 with SMTP id t14-20020a170902e84e00b001c0d5b12de8mr1214102plg.9.1696375066601; Tue, 03 Oct 2023 16:17:46 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id x12-20020a170902ea8c00b001bb99e188fcsm2170047plb.194.2023.10.03.16.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 16:17:46 -0700 (PDT) From: Kees Cook To: "David S. Miller" Cc: Kees Cook , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , Anqi Shen , netdev@vger.kernel.org, "Gustavo A. R. Silva" , Nathan Chancellor , Nick Desaulniers , Tom Rix , syzbot , Jianfeng Tan , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH] net/packet: Annotate struct packet_fanout with __counted_by Date: Tue, 3 Oct 2023 16:17:41 -0700 Message-Id: <20231003231740.work.413-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1323; i=keescook@chromium.org; h=from:subject:message-id; bh=GKawqwHl4UULkff2cIaeAmAbzx8aWFIbmG5VLVkLd4I=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlHKEUZGTBGbWEbfQHr5gGx1uBl6q3iB19j5TQ8 4R6/WUoIzCJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZRyhFAAKCRCJcvTf3G3A JiFBEACQ9z6btE2IRqV+dlPimus38QVTJ6TnbqlcqFLxVxfTBnSZPghD/CNiZuVouBKmCGzfc8Q H7Vlcjkf882aG66U6TSBtG2M9ndDjlyMpLwzjHNbD8sRH2f7VmHtLuM11Gsk7NAOMK2EU3uzZy5 la89UC4CnKbQoki7cdi96USYK87HkKEMQ2FoktbUUSt0jDgZopRsieiYMkvhr//uOV/XtuzQPF4 /P9r4qH6Z+cwQmuWV5fRvnAuZ+TtV6P8niy+TMK4u3v0NSyfhgqmzm81x7EEWPcApprDIIp7/Ep E4POegXoG7BGZ10Y216YaD9shGKXtcE8rQHPWfn95/z2HGh8xUrzz9M3VjV4A9KWS6NViF4UmKO TzlldgZ1RssRxTAChOf04lXMhc5VV8HFRnBkW+jIckgMei2klc0+SfeIERirUvcjDj6Hr/QWHvY 4bDW579Wh6lNWVjyQICRm5G3kv9dz3Zgtdwef3NgZqsj2b4Y6p9/dmmbYCZlXZTrzM/0xvhHP/x FD0LlpmYBbed2Um/PQTQHk2Kd0nVWGbNxKB4bLXoGIc1NCecn1nqCO+JuvFMMvlIVQM1WaBtor9 vrrpSr0s9k2fX6DT8MWId6QvSoe5Gni2yDgPb2AJ45TOUfZ1L7CNKBj3cHlIvxEm/uvbxIWDPco tS5hYpJ HBTM8msg== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 03 Oct 2023 16:18:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778778215000557683 X-GMAIL-MSGID: 1778778215000557683 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). As found with Coccinelle[1], add __counted_by for struct packet_fanout. Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Willem de Bruijn Cc: Anqi Shen Cc: netdev@vger.kernel.org Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1] Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- net/packet/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/packet/internal.h b/net/packet/internal.h index 63f4865202c1..d29c94c45159 100644 --- a/net/packet/internal.h +++ b/net/packet/internal.h @@ -94,7 +94,7 @@ struct packet_fanout { spinlock_t lock; refcount_t sk_ref; struct packet_type prot_hook ____cacheline_aligned_in_smp; - struct sock __rcu *arr[]; + struct sock __rcu *arr[] __counted_by(max_num_members); }; struct packet_rollover {