From patchwork Fri Sep 22 17:52:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143706 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5908539vqi; Fri, 22 Sep 2023 15:46:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUWSg3+54KLeYPVGy38yOxTxLX5C18vZg2xrlIRTYnkYBr8iBBwOOpKyc91Z21n0Rq/GkC X-Received: by 2002:a05:6a20:3d8b:b0:13d:2f80:cf1c with SMTP id s11-20020a056a203d8b00b0013d2f80cf1cmr1001260pzi.17.1695422809101; Fri, 22 Sep 2023 15:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695422809; cv=none; d=google.com; s=arc-20160816; b=MaMqctMgi83IcZXIpBUJKole5pU9H+89DI4QMpzdyt8i/Z36EOC2fGwQqj3ynIuf1i Bai99mMCVZjo7+pvtsXEDXwJmSv/BFnlg5X3iOM1PiRCy5K54IMM8IL8LW6z69Ysnzi9 bcBBUgn90aaqrh0ykYHhk6P0ONJzdFIQYQolXiy//GcQT+KZDxBbp/kIvWnus4uswi4M V8eVdWEJawQpYgH/1HtmQhKxWs30UuRvm/Bkn/OLUMn8qfrsJblIi/Ch25q8MvRJ64xh PG7fYQR3KQKWPfE0gy8/cFK51A2D7bK5nSgP43LVAnyjJwrLMmAIZBktVMEOqnbVXwJb E1HA== 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=AKcTEUj8iWRNEK5rhXHlvqlvJUWDGLncQV9/wNZHpmU=; fh=IviZJ0SAagSSvtjZN02SkP7JJjwX2wwxBNdsu3avNjo=; b=YlhUwLLn6atEy6r/d2d8YssuNno6UCM8OIVCKB5BWJMsbijwKS4sLVODd/8JctQqB3 Dr7rZCBzbjjtLC97lK0HSvOIJfN2q1hTpi3r2lWlUVwrPwva1HyTBp0Nc6HBiRAUf7+e s9ysO+bJ3L1MCx5CGIFiLYDQAJXJDLhZg3qZ9RBdY78uuoTzIiwof7FY8vLABy1CmoTE 1fz7LIjEnSEjIqudqhyI2JI4uDHpWNFTMDtkHYLQwQUOnyDRbLyAJpFv2vE7yapIhS0A nh7ra27k94opElbinLFPWjSboXhZT+iOCdzgaGER0Bb3k8T24vkTvHTl8vO7V9qiuYtZ mVhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="DYg5cae/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id e12-20020a17090ab38c00b0025bec4468c2si4668209pjr.167.2023.09.22.15.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 15:46:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="DYg5cae/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 2B6D1837A4C1; Fri, 22 Sep 2023 10:55:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233151AbjIVRyu (ORCPT + 28 others); Fri, 22 Sep 2023 13:54:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233831AbjIVRyX (ORCPT ); Fri, 22 Sep 2023 13:54:23 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D66CB19B2 for ; Fri, 22 Sep 2023 10:52:44 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-690f9c787baso2168291b3a.1 for ; Fri, 22 Sep 2023 10:52:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405164; x=1696009964; 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=AKcTEUj8iWRNEK5rhXHlvqlvJUWDGLncQV9/wNZHpmU=; b=DYg5cae/duB9AitzfuLwoe1UnHAj3ozP5sBVryq1BaipFeo4PzmKf62Omdj30V88bW g3ntRSeU8856wtgkqGKqu/L7dUwP6w9eUlkIBBQeXz9E85ChgNaZGDwYhIGaqPt52sUL F+f5XLvrAgo713NJoJOJB40zOQEzfLkE3tAqo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405164; x=1696009964; 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=AKcTEUj8iWRNEK5rhXHlvqlvJUWDGLncQV9/wNZHpmU=; b=dOPO/Bhu/NBILttd7dp+5u/oCV/Sed26N2DFQBmewSsJbR1jOlJ2A2S1baeemJ41uI z3usaeYjkGKZgBX5IzxcW71KLN9koUKdkFOdvIsQ9f2xHWewWxrlJPxcyCdQqGTX3oZB oiWPgjS7QL5EsLGaIDd+sxqTMjuge5rHRQHSncTnnHgX6Tx++NiBSSWFoG2EO/IeZ1L7 +lJyfbTDzv9i7s//qr+fjSbJLeF21QiNfbfOT+BpPgjZHS6EWZvG00tm5Vwv4djSqPrq G/YtVCAgynokgwECyqiVoK+LULf8eD9uxl4oyNmUnRBzxMMWlH0loSVUDTmCKqlvg0QS RYAA== X-Gm-Message-State: AOJu0YyCsyXwMipLNjPxPgbkSen/j+wHIJmiYSgQGzY1iuXnm8WFLQrs wndkCUK4yIQ94yp5QPIWq4O+eg== X-Received: by 2002:a05:6a00:b48:b0:690:c5cf:91f5 with SMTP id p8-20020a056a000b4800b00690c5cf91f5mr117787pfo.18.1695405164132; Fri, 22 Sep 2023 10:52:44 -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 w3-20020aa78583000000b0068fc48fcaa8sm3478519pfn.155.2023.09.22.10.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:52:43 -0700 (PDT) From: Kees Cook To: Kumaravel Thiagarajan Cc: Kees Cook , Tharun Kumar P , Greg Kroah-Hartman , Jiri Slaby , linux-serial@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] serial: 8250_pci1xxxx: Annotate struct pci1xxxx_8250 with __counted_by Date: Fri, 22 Sep 2023 10:52:42 -0700 Message-Id: <20230922175242.work.442-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1395; i=keescook@chromium.org; h=from:subject:message-id; bh=jptRej6n4r8+QfuX8ELfIL7gLpWh8NzSvtTLQlj3Cis=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdRqDUgpGkAhEUCeWeGjwYBLAvWqMcZQVrKX7 /m/cDSHO2uJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UagAKCRCJcvTf3G3A JgPwD/wOJwcIR2GmMgDcCm890AqV8kE/hY5vtXEGFf0gRO7JOOlrDWRrHsX3h8F3c17KPAsrIk7 EyCzeVTgoVgGMYNmwA3nqJBtSz8ueJTFy/MNhLfvQJ3aeDHONah9OwBYUG8Fzy9LsQwe4hqCmzA GkSs3nTFSjZjs7K+d7vNRbHZuN+8Ifwjr+mlK2pyqTpruWMQD+OYNdsCH+/cwRSZia+1O+POSpp GAG2jWADROCEQ7lVuLTbzhfH/dAta1Pf4M6ofuNcc12xICj9SVjHUxxNuueCeWuH1978GiyqxHu UmX/yu3PnghaIELLR/uwWN5DukiwoJJKk+wCRBK+rDonOSU9SlS8RW14dsTyZpov1B5TOzj+5FY euJ8NFGaA+6E4PnxbO35EJrkJVToLzkBPh3fFa4beFYkiglkSuz6R3btkJzGjhReBIFfty1HE8x hByFM/+Ko7whIR+pO95KPDv9H8+ksJ8wPVJR/i7AcCMCDHZAbOdSbHIIerZx/IRacRayFZG9Cf0 ddzxp2hMAQBlpopI5yQRhJEUWqgYBGBqIJ+IlMzRjvgNDh4MwPHE6RNbhhuW6f6XJlcDw8NGLKa vXdG8ciYRYOLfNbgunMdNeUPs/3joxwXKw0TanH4JtEsqxUDTqIzb8yn5U1Cb7ZRoLUHdOK6pJP pvSEvfa JuPKFMyg== 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 morse.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 (morse.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:55:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777779667123069037 X-GMAIL-MSGID: 1777779667123069037 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 pci1xxxx_8250. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Kumaravel Thiagarajan Cc: Tharun Kumar P Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: linux-serial@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/tty/serial/8250/8250_pci1xxxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_pci1xxxx.c b/drivers/tty/serial/8250/8250_pci1xxxx.c index a3b25779d921..0da9847f3e91 100644 --- a/drivers/tty/serial/8250/8250_pci1xxxx.c +++ b/drivers/tty/serial/8250/8250_pci1xxxx.c @@ -107,7 +107,7 @@ static const int logical_to_physical_port_idx[][MAX_PORTS] = { struct pci1xxxx_8250 { unsigned int nr; void __iomem *membase; - int line[]; + int line[] __counted_by(nr); }; static int pci1xxxx_get_num_ports(struct pci_dev *dev)