From patchwork Fri Sep 15 20:06:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 140977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1514012vqi; Fri, 15 Sep 2023 23:47:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/xPGNkRrlwJDWrK5p3uAEM2oPZQAubxmfHIeJ8TTwPj89qo2j3aGfzKmrP0VZCdXaMU+U X-Received: by 2002:a05:6871:6a8:b0:1d0:f921:2096 with SMTP id l40-20020a05687106a800b001d0f9212096mr4343147oao.29.1694846837784; Fri, 15 Sep 2023 23:47:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694846837; cv=none; d=google.com; s=arc-20160816; b=Hl2D1jU4nONSLv8F7Tt9QyihLDvW9iFO+ywLZ7n//5qEZ2DxKO0xbS959k5BfRIoea hVujKW+cfJMRzjmFpZE7gIbeofaiAA4x0/MdVwXF4Pe/fGbQZtGgg9x0iQnUkJS/qwdD bpIqazqXTD+8v2+7RqC1Wxj3YCUf8axmnrjrdQ3GjE3fTWjRI3wj9bezt+5BijuJ2Oob khCTwpSlxtzbf4ahdhUTB9ciQVCt0ojA3Yu2XyHLatwlJHMJH6+3hZMj9064F1Sm4j/b cVtVFrgLNNMxWLFNVSZjteSFa9gdflJyE6hkmRglih+BrWyYUtMwjiVa8fxeJreS/tS0 RFqg== 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=jatWasS204QwZuZ1cmt7SDqxcoxRSBD/dVPK2mjyGCY=; fh=E0hjKUfk0ysoLYgk4ttfALlF3DREeEBgTAZEGWWlCEk=; b=Bzb4lZ6XGAIcV+04Mp9pdSoA1zLYaqWbKGtwwRkWCZoAH3pzZ7D7hw0m2BfFmCRjwy az9BAE+9Owz4DXevDj5WpsgWI2pGKkTHn+RsY/UpKcrPDzIds4mgKjYyPupShMC2xgFn x6tFKqSdv7nQAu8XNWgzO7LsCdTowp59QKoCEmpwbajuDKWibXjO2yxm+zvckv1YIJF0 fc01OmMgPIQnT8vHH+72+5yA4WIDfbtZU/cOdgUbiBlK8PDSYvWuS7vYs3/gywjladcj IDlHrfwlogNYDfdPkDj7XxEchaQ45iMoD8TJKB5CDdBCcieGcsAp0uyXMXg6VNX7qlmq +4yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="DtiS/q9Q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id t71-20020a63814a000000b00565f42b81aesi4370147pgd.65.2023.09.15.23.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 23:47:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="DtiS/q9Q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 496A080439AE; Fri, 15 Sep 2023 13:08:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237071AbjIOUHi (ORCPT + 29 others); Fri, 15 Sep 2023 16:07:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237090AbjIOUHF (ORCPT ); Fri, 15 Sep 2023 16:07:05 -0400 Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B5E32D4B for ; Fri, 15 Sep 2023 13:06:39 -0700 (PDT) Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6c0b3cea424so1450835a34.2 for ; Fri, 15 Sep 2023 13:06:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694808398; x=1695413198; 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=jatWasS204QwZuZ1cmt7SDqxcoxRSBD/dVPK2mjyGCY=; b=DtiS/q9QD7Bu9ldNxfYjldKjFGNjvcVc/fz5/RfSEIqbbfr+obLCqFTu7691R8IBvZ +4ju+MQ3V7Ahyx/K56Ph/8Eo5P/PZzsOzeLQj98S//Pql5uwoC69jiU8/5ZczX19tFVM 4aBgjzBoQ8p5sNwmOxFH26Z3pe0YlGlUTGuow= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694808398; x=1695413198; 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=jatWasS204QwZuZ1cmt7SDqxcoxRSBD/dVPK2mjyGCY=; b=tpXXN6+mkXGPS+YvLFA8s2EGOaaAMab4mylZ0PCYxr6ouZcX10cRV3sUPhiEg4HbB8 fYuSQfj0bUCLk8HR6n+OIRkIJ9a4oMWLXgjM+9GHjqhPAs+2OwTz42WZpQ+x+LDzTgpa 3vMl1YTx+nMG78tl2qpRxaSxrx37CUiOPw03VrtymvV4CB+1IuLqBwybo/Qalv7O9O1U FEe1sXiPJdBilrBUgz3B8/5oQFlEC9wo0jtzxyrgwGS28c0YpnwmGiQ3Y5q62yxIXNjU GO8sl1aLsIcAfR/xHhUtsj56JoSk+0wgc5So44CHapaiJgEOKKIebWocp1TXshNX/Nm6 e8pQ== X-Gm-Message-State: AOJu0YxQjSKEQDUoNr8+wvDvK1eyWNpBb2EmCRZJ8PPdhxkggfr1wZfU otlkICWfqWn/9PxWjE+R+xEq6A== X-Received: by 2002:a05:6358:2910:b0:134:c37f:4b64 with SMTP id y16-20020a056358291000b00134c37f4b64mr3429872rwb.30.1694808398331; Fri, 15 Sep 2023 13:06:38 -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 b127-20020a633485000000b005709b5aea02sm3039409pga.63.2023.09.15.13.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 13:06:37 -0700 (PDT) From: Kees Cook To: Kalle Valo Cc: Kees Cook , Jeff Johnson , ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] wifi: ath10k: Annotate struct ath10k_ce_ring with __counted_by Date: Fri, 15 Sep 2023 13:06:36 -0700 Message-Id: <20230915200636.never.762-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1238; i=keescook@chromium.org; h=from:subject:message-id; bh=W0Z7FKEp2ozBJ5/t2fUugzUzm+3pU7NY9bmGkgl9TaQ=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlBLlMujYCGGfE+LkiGsu88vAuQpO/bsLI9ODrg 7qJQcqRlzGJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQS5TAAKCRCJcvTf3G3A Jjo0D/0ZhZjM3umwDd4cScp/pX69G3PAuyE5MgO0WMxQPUuULMPhwefs2sxa4V3f11IiNVJnHtW soi02X7jMpU81gA0gZljCei7qMNuZza5nCUsLw/tZFEvOS7by/LWH8N8eKeC1HM/gX5nJzk87sJ 524wLuAgNxeE0ZKs0kE17vg/QAtRZ6AlhVxJHN7W7oZ9vFiabMcnvDOvUvhnIuCmf8H3yyepMSJ d6PSUEAVtDnmd2z/r+XAp2jILEyXzM6oLz4v5N01BYz3qvzxRPyleV3r9ohrfGd6QO72+Mhqytj XRd8Uq2Ltx/5ewjaD0vkDWzbroV8Tqj72dqgpBMXz4328EyeVueyo6mlXGorpgbPwNZSpdZP3a1 0454XWq12ei33x2sH7xkEJxQLtIOT2zKBbsHKbRwvZce2PQ8CJ4LxhI3H3epIf+UrS+uNI0uWhk jfhiAhauj9nXhsBYt0O13AerPQdVoH4ctqLYVVemaRiw/5hjYV4KGHuBBJDVUn764lRWVLTVrn9 I1XmUF7VjpYkMj69QmvuVWq2SH9J86c7DoBPTsvhm+jnuIpGgHXpSAv4Lxn1jCzcqAnQtT1Wtsj nHP3/4jYzPx4uftHyuLbcVY2hdrDEZmCqB1MR+NSI/12asuT8+6iz3aZ1CejZmkYpC3UTRBOnfT uRisExq MWP+8iwA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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 lindbergh.monkeyblade.net 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 (howler.vger.email [0.0.0.0]); Fri, 15 Sep 2023 13:08:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777142734917770220 X-GMAIL-MSGID: 1777175717520102024 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 checking 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 ath10k_ce_ring. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Kalle Valo Cc: Jeff Johnson Cc: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Signed-off-by: Kees Cook --- drivers/net/wireless/ath/ath10k/ce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h index 666ce384a1d8..27367bd64e95 100644 --- a/drivers/net/wireless/ath/ath10k/ce.h +++ b/drivers/net/wireless/ath/ath10k/ce.h @@ -110,7 +110,7 @@ struct ath10k_ce_ring { struct ce_desc_64 *shadow_base; /* keep last */ - void *per_transfer_context[]; + void *per_transfer_context[] __counted_by(nentries); }; struct ath10k_ce_pipe {