From patchwork Fri Sep 15 20:03:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 140739 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1362396vqi; Fri, 15 Sep 2023 15:47:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTLqEQQjsFWninu8eAm3CkCs1PDZ3l6Sc74sqO8sx8dyYL3Ob7krddhibdqxNw+tuqu9AP X-Received: by 2002:a05:6358:339a:b0:139:5a46:ea7e with SMTP id i26-20020a056358339a00b001395a46ea7emr3674850rwd.28.1694818023617; Fri, 15 Sep 2023 15:47:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694818023; cv=none; d=google.com; s=arc-20160816; b=j4b90Ywt2Inhgcb9Iqestl8TJyNPkUKALOsyG/48xlf97ow6PpHVgyurPkP5JEcyfR J0Ylpd/2VXo/sDd6yIbcgqMktb3xU6o9ScWIJm6vm4ithKN4a5Cu7+M9+Ok/4pZSirb5 nK4ZB7wDCmEIIZoWy0YsVORFY+KYyzHt6wZvt+kpCS8FfMn9y3H/qWuTXlPsixYS3OjH MGk6CDwLqTsU7/WudCqxkqSA6zF0kc1DUlbbAcJ2R6t0puxnePOLk2GOEZ4QtR5Ee6FF qezFYDnuacwdYRXw/Van2iZdawZFhpu2kErWda7HMprsxDZRpVbgP6FR92j5lkZ+YlZK nNsw== 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=vqU6w0o7wis7lXYiV/PtYRUS9jkyqSgo8jH+nv7z2lQ=; fh=DMPObLaZB4+N9ItJSwfNaBo98BIeH0vuNbOoPH1nvuA=; b=G8Q/gcjCHPtATVLa1v/1BktXgW7kHUM7pYJP1TsbHNPGrucDPz19sx3Ov0SlF0wNKl leSwvRFHw606awA/4flxb5LhngCVjrfcPHuKWmruvbe0juCnFfUton28dPdTrFjXrzlH L2uVGhM2Tu7s0DsRx/zEDnpgVzWONI+PgU9LgNrvpAi8zYfHyjB3ZXpRmeCFN2e/BPB8 FhEM8QOTaK1aEi2FwD9/6uCL8+ZFUuteFy92NlhDIZTFiMii2dP2Mt/J7uc42zYIgW0n ZCFmP5O2a3UTzxJ0eSXa4sogj5vEg4r9gJTgUMUuDA3jJ4vpVPjwX3DVAooHMQI+IHaS ZfGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Te06Ig6y; 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 l190-20020a6325c7000000b005740286f2a8si3892650pgl.286.2023.09.15.15.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 15:47:03 -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=Te06Ig6y; 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 A23AD858E926; Fri, 15 Sep 2023 13:04:35 -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 S237067AbjIOUDx (ORCPT + 29 others); Fri, 15 Sep 2023 16:03:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233599AbjIOUDY (ORCPT ); Fri, 15 Sep 2023 16:03:24 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25431211E for ; Fri, 15 Sep 2023 13:03:19 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-68fb5bd8f02so2476605b3a.0 for ; Fri, 15 Sep 2023 13:03:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694808198; x=1695412998; 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=vqU6w0o7wis7lXYiV/PtYRUS9jkyqSgo8jH+nv7z2lQ=; b=Te06Ig6yNLnKo+W5QXpfQ3zaH+vcXPDIKySu+D0whY4WIV1UeT8xtsBEYrVekWnXqH JIZzAOcFg4WzkXLSCD0rUvE4HgEnstk4MPd+iAVc9CfRWQPyxAqFrkWgQt6sILxaRGBU 7gWmfwAU/AHDovfFDnbFcqVq5XXabFHUAdeWQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694808198; x=1695412998; 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=vqU6w0o7wis7lXYiV/PtYRUS9jkyqSgo8jH+nv7z2lQ=; b=FGHCXGf9ecv6IyK+zS5YnRO08q9jiG+vpPlFkZA4uAQsCF9SjbPPJKjghXMMxqdiMP ilbgh127LPI2Cvq7ZZyc1mskAiz3lL2kuK7RhBA3FB/txjjryXvQsM7Oqg9LWsxwbAwk Hoh2DAtyjCXZY11GzYUbT2Ut3Dtu1EcEGoaiVK9nIZM4yOo+uYO5N4GtMOJ18RzQrppt 3vFN2JxPD8TsbZXolOJzictBZKkmm8OBRE7yTB1FYWhkLzSfG4iNV7KkZ1K3cwXHC9Yn 8SVSS/XRnEAkVtW/ulNHoGl8nb1MxZAwlBwIgO5iPzHQ3N8cUyQ4SNbYsivOxwRBNlHG PY/w== X-Gm-Message-State: AOJu0YwIo1icjSLeKHjHGXNw/odmUsnTkffsazu0HBcSepPPQz30+BQZ fUAZoepoKUNvJ1jJdmkRrF5x9A== X-Received: by 2002:a05:6a21:3d82:b0:155:bff3:ea1d with SMTP id bj2-20020a056a213d8200b00155bff3ea1dmr2858114pzc.58.1694808198682; Fri, 15 Sep 2023 13:03:18 -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 s24-20020aa78298000000b0068be348e35fsm3327629pfm.166.2023.09.15.13.03.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 13:03:18 -0700 (PDT) From: Kees Cook To: Philipp Reisner Cc: Kees Cook , Lars Ellenberg , =?utf-8?q?Christoph_B=C3=B6hmwa?= =?utf-8?q?lder?= , Jens Axboe , drbd-dev@lists.linbit.com, linux-block@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] drbd: Annotate struct fifo_buffer with __counted_by Date: Fri, 15 Sep 2023 13:03:16 -0700 Message-Id: <20230915200316.never.707-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1342; i=keescook@chromium.org; h=from:subject:message-id; bh=ZUSAvLi9vR+UNAa6nUlqpsYdl2ki5xpNFUW+QWpv+Gs=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlBLiE6lCzis0gsISR4JNPawG7ZHd60KeU/nnbd V8maTMUfi2JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQS4hAAKCRCJcvTf3G3A JkJlD/9l0pF1aFUgbVK4svrSUi+5O9iGRCXOXyoA8gV9689PopMTI0ye6wlfzm8Md0iYuPfhPXN PiDaHZayfKusmZu960KmvoYn86R3PC7vusckxDFxIgZLKpHbUlrnIEvHyffN6rhQz/U0x3f3FOZ Zo/+lHw5TwwltaJ0UuG4XxTzBmorhPU5VRUUvs8vN9MbJh+Zemw3EIECqisOwSLvIb44xn2EhsQ ik9K5alDkuinwcoxqirtInCYXfVkatpA9hycu0y4BxSbpaHfeLZ8bD7qFGFWPWuSPEkoRqag+5a I/lOP+ADDanjP1tHpdyL++/bWKhxpdzJQ/V4i6+OwO4240bpcoULvIZat0qzQ/Kc4O6E6V2FYEQ If+FqC7XhZfU4OxTEaOECJUi4i1ziEZcD2gyrR4ZOLOD6WhZr7lqtDXhRDtGvCD1vl+/3u/frmE 5DpKvhGaM0oE+x4HjT7CKuptyzLPaNpdjfbLBI26/9nHIWMorznDsuAigef1YyWMjfRg7mDsWyv Wyf2UTzCBZPa4ezkhWjsFB9DAllI18T+IPzhY3S0g70qdnZvZDlJ3fDhraSbUyCE/e2jVgPbvJW 6Tc6rXSm54n7WhP2cU6JIa/9pPv2J0rVcbUYyOqICMjEek0DhJ2EUyUa2umQjR49gGfT1cnVha9 e44QrY/ OHYIMW1Q== 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_NONE, 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:04:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777137451780486524 X-GMAIL-MSGID: 1777145503969304191 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 fifo_buffer. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Philipp Reisner Cc: Lars Ellenberg Cc: "Christoph Böhmwalder" Cc: Jens Axboe Cc: drbd-dev@lists.linbit.com Cc: linux-block@vger.kernel.org Signed-off-by: Kees Cook --- drivers/block/drbd/drbd_int.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index a30a5ed811be..7eecc53fae3d 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -553,7 +553,7 @@ struct fifo_buffer { unsigned int head_index; unsigned int size; int total; /* sum of all values */ - int values[]; + int values[] __counted_by(size); }; extern struct fifo_buffer *fifo_alloc(unsigned int fifo_size);