From patchwork Fri Sep 22 17:51:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143579 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5786678vqi; Fri, 22 Sep 2023 11:28:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEXYwmank3JUN/Dv2+7/dEN7sBzv3kL9he0qIcw7hhNe5dhGbfWkVp5AXPeETcVUXgto5qV X-Received: by 2002:a05:6808:10cc:b0:3a3:6329:4cb7 with SMTP id s12-20020a05680810cc00b003a363294cb7mr551609ois.9.1695407334578; Fri, 22 Sep 2023 11:28:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695407334; cv=none; d=google.com; s=arc-20160816; b=vFALWC1AtJdhblo6u9JmpOkcCJmgfpqJZsOKcoypAsZS+/4ap5+eCJ1UpHCgABoUsm xpF39ewD30eOyoWSvJ0BkTHfXjp7/cRxh7oVjHAhBA+uGFgdJ9UCOIwFIYE024Y0fOeP dY34ObuJUC0rclYB0d+23BZ8VTsCgd9R3L0++jlqcnf6fZG80DQrEQiNBs0ZXu7mN6hW mR7iVTXkOC6QbbX4/hAB0+FpNOY6D8Grb87pzarq93e1tIFPpGrXcGyeKLikF2Hby+6q dhmLbhdbsJOghO/qxvMP9CrUo5ukVpIrCR0K3CS6UTjTOuQgMuboey2IgPafl3t27c9u Ep/Q== 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=6FhFEbneXxxaBPpeUpxOqm5me+1wuH+iOEgRRKvJoLs=; fh=MXQ1VyS2Ouc1zlf19S2wtVEq5kqj4plg/6bNDafFYGk=; b=Gh9qbjkObnmPXyzECct6OB810T3mPHjKB6ZQS1XJleOXlrVkSCODtzIYyPT0m9A/AY TsrmvEOACSIzhD8BRMRn9IB4JW5CWQ0zfHcqkaEZb5poXKsZr8bzEAW6MK7plzHvhPdG oUrzwD0NT9eUezscrQscpxidANc0SDChXQBFmhIRer4/mII/mizz9WcnD5QjlcPz6Rbn CKF2jRYQO2Z5sf8XuBL3j6JzuGWGHTeAvMWKikc9PRhThYt7Wtb6tsD4EY0msHjBjvOP XJcJaIXM5IFaaKf8GSz2lXitcyXsGJ4w26uN/bgWMNLdVDJ7hi8WsrTWxkWT3LB3Qp/k rOSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=B9ZjAfzV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id t186-20020a6381c3000000b005780a1effa4si4033170pgd.375.2023.09.22.11.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 11:28:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=B9ZjAfzV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 72C6083CDA43; Fri, 22 Sep 2023 10:53:00 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233678AbjIVRw1 (ORCPT + 28 others); Fri, 22 Sep 2023 13:52:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233684AbjIVRwE (ORCPT ); Fri, 22 Sep 2023 13:52:04 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A70A1996 for ; Fri, 22 Sep 2023 10:51:17 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-577a98f78b2so1781744a12.3 for ; Fri, 22 Sep 2023 10:51:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405077; x=1696009877; 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=6FhFEbneXxxaBPpeUpxOqm5me+1wuH+iOEgRRKvJoLs=; b=B9ZjAfzVQZaHVrlciIR3H4q/zXJyYPCqaJBM2fVayL9nrchrdpkhrAGndqF08888Jr etFm/Le8FHSMmf4iTFfCJOwwljwvGy9977QUvcHKPOLfngnoqS530fLS1gBSHHqODAd7 gqOm8xmUlS3hLmDY3/NQiLvEoGdP5MCjLFYzQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405077; x=1696009877; 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=6FhFEbneXxxaBPpeUpxOqm5me+1wuH+iOEgRRKvJoLs=; b=AdU3tLYAOgx6gIsP4F4lhiucQWKEqSvsIYB4WXfxB16Bv4SNqQFLHobasOshgiPksg pLDb4z3KgQW5+PLkxNYcUPXhpD3pljmRQtsEyEc3WBp6i67STuEH4NBmGdWbAZnXGGK5 W+Xwtb5dY1ZTc4OWK5fHZh7LdUOuGeUTWIL5OjcBsA1e8JP3Xd/Zyq/t+aVqzxj3MobV u17QRygkWuicN50+f7uEsY+in1toBnphdNgGs+BMb+lze6QncaIeqnYiAvSf/w89iHBG xgiFVTwoZFLUm/1aRSI0YJTOEVeGpv3Tl2KWMP3tB3Fi/NNL7lZXeWS9xIqGUZ8Hfqpy Vkfg== X-Gm-Message-State: AOJu0Yz7rQXHhpze/7IkIIoeBxiJa2m5q+iUhyGWgDlvbcBVey0xul9i vcX40HxbuR26moLXN5vSwQrVuQ== X-Received: by 2002:a17:903:11c9:b0:1bc:844:5831 with SMTP id q9-20020a17090311c900b001bc08445831mr94508plh.57.1695405077190; Fri, 22 Sep 2023 10:51:17 -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 jf11-20020a170903268b00b001c0a4146961sm3792429plb.19.2023.09.22.10.51.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:51:16 -0700 (PDT) From: Kees Cook To: Amit Shah Cc: Kees Cook , Arnd Bergmann , Greg Kroah-Hartman , virtualization@lists.linux-foundation.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] virtio_console: Annotate struct port_buffer with __counted_by Date: Fri, 22 Sep 2023 10:51:15 -0700 Message-Id: <20230922175115.work.059-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1223; i=keescook@chromium.org; h=from:subject:message-id; bh=hLc6EjIakpzsaX2PmH9KGXcoCU7k7VxuxAddnu5wvP4=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdQT7dSBQHc/s6zgQ1bG9pZSaUdLcPzEWU5q+ UW8H+WTeDCJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UEwAKCRCJcvTf3G3A JvOmEACk0QTdWB4H9s0DTbpqXHzvscY+UZub5Qt5LP0HSsv4VUHS2VqKK302oSkpmjRd6PnScRR CgD59KxXDfrn0HXWKbgYGs9RBY9LB/BYhtrPIB+oA4X2l2bejqg//JPkCS5c3YQqgZslnuhfY+K 2qWoHc1d1Q51y6JIDeheahZwH2BAv/dhFLmVYKUtR2CMk6muErN/cf6KqtBMdaqmPZ3PDtnHnnG M4+CHKXrUvsM99Lcvi6rtZ+r4n5q6CcSns7LnRTpajJJesE0zXK5GHp36jbRQ06nZzMWRztHxt8 bNaRpaV55BWkecXEOURmiGWFxtqwNgaUeY/uBYqsl2ND5izgFB8mnE7jPdvkQNUPaQbbBSsyXc2 xm0/NYMUo+aUXRSqxSptEQhc1ANGAwMUx8tt+8y9JpsZP/2691w3VuXNzp/pCtK4j8a4sJrJ/on XMA/XKEbifZ3ep9LXPAHWWlwjSVSvw0jzJ8ZgeKWjQTvb09AawkDpXmhUr8r1bSCoKQksybOR6S sRo2x2Xc4LL44AKxKWTZ9HhOzAn/iScJowWZki3dOZrMvsN5Gved36lKyWWuFQifTANbzNIPFvR 1K35LT2O+9RZkieJErqb3GdNTuAQLgzFnrq4CtpzXoKu/Tst3IylFRzlkloZnU+cgGX1uqfgtv1 OWDskmG st82qa8Q== 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,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:53:00 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777763441230793379 X-GMAIL-MSGID: 1777763441230793379 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 port_buffer. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Amit Shah Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: virtualization@lists.linux-foundation.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Reviewed-by: Amit Shah --- drivers/char/virtio_console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 680d1ef2a217..431e9e5bf9c1 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -106,7 +106,7 @@ struct port_buffer { unsigned int sgpages; /* sg is used if spages > 0. sg must be the last in is struct */ - struct scatterlist sg[]; + struct scatterlist sg[] __counted_by(sgpages); }; /*