From patchwork Tue Oct 3 23:17:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 148083 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2409382vqb; Tue, 3 Oct 2023 16:18:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHY8ouRhWvODHPeVYHu7SskblbrEKYbnuh5n2vXXsAUDBt8ApUJy8XZj/q57xdOKYvlrSJu X-Received: by 2002:a17:90b:4f4c:b0:268:5bed:708e with SMTP id pj12-20020a17090b4f4c00b002685bed708emr641650pjb.24.1696375110461; Tue, 03 Oct 2023 16:18:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696375110; cv=none; d=google.com; s=arc-20160816; b=zah7GjOLEmgY1h4jOv5AklFzl/p4KXQE6wqtES+WeIkM4ulzCRKaP3W0Bf0KjrQ0sR kTOx9iGGY/lQmL88T7hzGnfNMXRK2rQ0aF5X/Z6R1gatr/G/nn6yNH0/ap5w4UXSXgbB 68yfYpD1301Cl3wWwmFyqH12NwpRC2H6ImgR+F6Xax9/7wHjRKtzz5MSANrhbJeJNhPd iIckzeXW0jwU5bGT/jbYMjV2TPmneyfZIignqPqmyOb1ydKAiZZk7xbNONBAfEjpI9CP u5L2KAEdQSusjejhuxRl6zIDB+eer9Z7duQGW8tt4EWHY3AAyL9g2wYP0oC9P+zzGHq4 l+7g== 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=bih+EsLhqqE18INEKlidrn1Kal2heWWzJ4ETbgTX94I=; fh=qs3+ewvyqgeINTR09dozzgYvTGtlXXcDVGmDyrNXe9o=; b=JmxOrjDqeYqzQPNE0juN5Wj2iPYCu+M4wMOPnrWYaOIsvxAQI95FPxGFqKQMXG6L4M uFA7igVICOslfwEPa/4yRCuwn12M/dMWlMYdUpelDcSJKM1u0rSUFxJIoeBkjWmtISGV 5pOvZLVHv0IvMYJGCDi6VLUjI9a7bqBLai7cAJAhaW8BjbxQIGXVtKvzxEut+RLUJ3dB TIu5jvXe+phmWc4cayzgEV9QFfok2FUUI0Nt8qfdC0X2eVDznWuP5t0E3ZUd03ztqknz WwM4BoW2Hlsckngym5rK4flfqQat4khO9rpVLyUQcCgKEmQF79HmK+xFl5brCJqqIuSI QWSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gWbjyVCS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id ch1-20020a17090af40100b00274ac0df61bsi265050pjb.122.2023.10.03.16.18.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 16:18:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gWbjyVCS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 2D12581B2101; Tue, 3 Oct 2023 16:18:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234188AbjJCXSS (ORCPT + 17 others); Tue, 3 Oct 2023 19:18:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232657AbjJCXSR (ORCPT ); Tue, 3 Oct 2023 19:18:17 -0400 Received: from mail-oa1-x2f.google.com (mail-oa1-x2f.google.com [IPv6:2001:4860:4864:20::2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1A42B7 for ; Tue, 3 Oct 2023 16:18:09 -0700 (PDT) Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-1e12f41e496so971870fac.3 for ; Tue, 03 Oct 2023 16:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696375089; x=1696979889; 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=bih+EsLhqqE18INEKlidrn1Kal2heWWzJ4ETbgTX94I=; b=gWbjyVCSoYjNgqXY/1vrUb+LcPUVzLsCYd7NQ/l6818pTUxFjo1kTibUBwZZcAxeDw 8UTxJ9ujjwDrG807kDYCA41CE8uPjgEI8gGxCHvA+eEFg1T5H4Sbrsi9o0fDo1x7ru7l bJ5eE8X2Xm4UMGTLConj6pLRJpH5B/igY3M0A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696375089; x=1696979889; 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=bih+EsLhqqE18INEKlidrn1Kal2heWWzJ4ETbgTX94I=; b=qlzhoDD8CMVWtoPQE1UaSMy7o5TdoIL5dXfUiY0xUg7mWoJbsAzyIz+kQRBHTjPRp0 /A800lSrwMCMC/bbCjSeJK961T155MbhAtpjpbGnObXqOkAI8dJXsOyZwio35YRMJStn QYAdICHeoxe+XxCDqW8zVUrpPrEd4JqCr5uEYZvo4MgbMmuqEb+eWhFrffMXyYUmcG7P a3iRyZpXx+lB2m0zx2ZhEwlGdl2dL2qKuBbAYr6NJTLRZsu6XJmkIE8XTRSpcTM75lEA UDvPzjqwbgLCuTP4Oiq2GuzpQrpmT3Mu3UpFnHv32jl6RBQvkNlf/jhX4t34RRjoRcFG wJZg== X-Gm-Message-State: AOJu0Yy9QLoz3RN83V4sxfFuG9rFs6zOBib8VikX5Sh9/GykyCiVrEts Ny1zOoDEykmv/9J+Nfwj/5gJmQ== X-Received: by 2002:a05:6870:f708:b0:1d6:567b:7a93 with SMTP id ej8-20020a056870f70800b001d6567b7a93mr1041157oab.11.1696375089114; Tue, 03 Oct 2023 16:18:09 -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 fm18-20020a056a002f9200b00684ca1b45b9sm1978519pfb.149.2023.10.03.16.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 16:18:08 -0700 (PDT) From: Kees Cook To: Pablo Neira Ayuso Cc: Kees Cook , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, "Gustavo A. R. Silva" , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH] netfilter: nf_tables: Annotate struct nft_pipapo_match with __counted_by Date: Tue, 3 Oct 2023 16:17:51 -0700 Message-Id: <20231003231750.work.190-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1445; i=keescook@chromium.org; h=from:subject:message-id; bh=Wy0TE8qEtssfM7cN9gcV0HXN7z8A45g0+0RjkMYsJ6Q=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlHKEeqBf2tLycKMWuivraE0LzPS9ivsggbdtww QfkATjpb1eJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZRyhHgAKCRCJcvTf3G3A JjOHEACMTVDOfHBHAk8PGKTzvz8VfSLnexla3kFw3JTpU4WFBKxGBGl0Rk5JPIl9QNAC7P8Tv1D tc6AdnTmyqE+nwKP/rjvAMfjAYECHpwYOaJAeUK0uSQQ3jiYQ204Rz1XeNmkZtrPMUV84YO3wn+ z9J6E3OILiVubIm1FpaooFMb2RfqcbXIrOvy17H2o3l5TFI5SlTdOudtqU2Xfw9MA6gCOSPUAD6 E7/ZbZKh0SUmBJ8g2XXQ1efypS4fTtGGX6vIjdTFNb3mm/pl8u8pUb7HIHIHmx4ajHVULNXKhJS FR+2+4KIcgUfZUwkEVfkbHYdrPhSezICZCwT98pN7OaP7oSAmWvM1r4OgWIwd9HZH9//lFyFOwY ku9TgykVDQJR1/DogW3OlpuAW3tSz/kdhPLsQzo37jmts3qaiNitpS798OLrieiY/7QCbKO6Hro vfM94GieScRafb2hlRygTpf5wAVkl9oWAlzXRrkQ9Op8ErfEGnPtTwp+0/+UEqXWirSg+4H4C1j /6joRVoyBrCr3Gf0sujbuMbKM2gE42TMVkCJJU6EUnIi3F4F6rLLbcywyi/unnsiDjd1Lw3uUZl tCYdMDgGHXxRMzdhiqbuSLOqg6Zs2i5mheccBCbgvf7k2bPgzQlmsTRrlmWWWwm0+BhcuXWScmO cyWMQGk mmrEgDeA== 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Tue, 03 Oct 2023 16:18:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778778227898324465 X-GMAIL-MSGID: 1778778227898324465 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 nft_pipapo_match. Cc: Pablo Neira Ayuso Cc: Jozsef Kadlecsik Cc: Florian Westphal Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: netfilter-devel@vger.kernel.org Cc: coreteam@netfilter.org 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/netfilter/nft_set_pipapo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nft_set_pipapo.h b/net/netfilter/nft_set_pipapo.h index 25a75591583e..2e164a319945 100644 --- a/net/netfilter/nft_set_pipapo.h +++ b/net/netfilter/nft_set_pipapo.h @@ -147,7 +147,7 @@ struct nft_pipapo_match { unsigned long * __percpu *scratch; size_t bsize_max; struct rcu_head rcu; - struct nft_pipapo_field f[]; + struct nft_pipapo_field f[] __counted_by(field_count); }; /**