From patchwork Fri Sep 22 17:50: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: 143621 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5821001vqi; Fri, 22 Sep 2023 12:33:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2+7d/V27fsn9tXyWHU4AxZq+utUsAuExG1dSG4dnIzMpRYTXAXTloX5VwlXNld55fzGGi X-Received: by 2002:a17:90b:4f4a:b0:268:c569:f2af with SMTP id pj10-20020a17090b4f4a00b00268c569f2afmr615191pjb.7.1695411179482; Fri, 22 Sep 2023 12:32:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695411179; cv=none; d=google.com; s=arc-20160816; b=RNMdx+GyznrQn16+Svak9eFztllYVsvE2hjR9g1+B4AjZUVzPjBLsMbjiFjXLOYzaA IMYF1bqd/8Ru11OLpWxsKiNLD4pQiGCDdjjXi9xOGC60htmTGXVai5h6OwaVZlJkeYgp +mFXRQgjq851hpE4Sa0QxhYvkXeKy+jV5fQ8VsHO6qhv0MBtyqOyhpcV8shb9qv6Jywf t1+LUN5NqxlmD/djxEQlNA++TEEJ0myXqOKofqdwg/5XbdOzr/X+kxpx/rMSVrEDIm7b 80SELaCsxVmMuOqoDoX2CrF6Lja+7Xx3qy9xSKEUhI1p+9Ros7npQKcFDs7bFTW9bhg3 pbIQ== 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=yIEluTePXKUgmZoz//4ptV8zeRXzjojVV5Zn13TdbAA=; fh=M51oUmz/+rpeCzVswhUh25OCHPZRBdrs+G/94Codg2U=; b=kKHk9vQs/oVhTnqwJR9Hfyy6gAu1qYbu2H8jcoqSdjjAwyBOz55bC5ort08VEfN/tx YXPW3biVqLm5Bn+g9WDz1Q6A197W2FdUo4R5KnqIVBcZIH8rhE97nHUcInkWTk3FFku/ IcmW+cEkvOh6eS6BO5K+j4jGAwebjATwykHlMcdvQmTltvSlOybn1pkDBLR3yFZAIZcf izeH0/Qmr8m+jp62JZeL7xJWxpkozO8/f/Fk2fOtoAhmt3CTL7rMpsUgLEWZzF2zOP5z 8UKUVLTUqBBKqUapDaNQlXTTLb4O6iIIlIi5wl2J4iZealUTeT5FBc0pF6czuIt81OMU n7ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=B8ACxVnm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id b5-20020a17090a800500b00276804791a2si6358169pjn.62.2023.09.22.12.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 12:32:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=B8ACxVnm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 DD01D8374BAD; Fri, 22 Sep 2023 10:52:09 -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 S233573AbjIVRvT (ORCPT + 28 others); Fri, 22 Sep 2023 13:51:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233576AbjIVRvB (ORCPT ); Fri, 22 Sep 2023 13:51:01 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9397810CC for ; Fri, 22 Sep 2023 10:50:44 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-68fdd6011f2so2022210b3a.3 for ; Fri, 22 Sep 2023 10:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405044; x=1696009844; 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=yIEluTePXKUgmZoz//4ptV8zeRXzjojVV5Zn13TdbAA=; b=B8ACxVnmTI70CkCoVxDOImntSKGYWkxDtztMJ2WECSD0rLzx9Jds7fYgy1zuD4+/Oa Qxg3wfnkJsQjDAszIq5zLtgnIByRNxCz108y25uGyofojIaLImyMsaz80znXdC75p5oD GFzsiJmJyYoRUmIFPHL7nx7uLkj5rmDh7j7vc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405044; x=1696009844; 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=yIEluTePXKUgmZoz//4ptV8zeRXzjojVV5Zn13TdbAA=; b=r7/C6sAeyLRO8hKCZHZoftPnFtmtXAO00oU+9YmeR9O44Wj6Plu5PoePf73wDBk+J/ 1cBZjRcUyYE0PI+uOWflXAnGGcwfAAMNbVREBXwJFYSwOMWAGaBlY2uUXdcgEVbE1I8P dfvc/BTya92QIkd6hNiWklRQHKZswQ/IvUGf+x+jdzEDKDDrvWrDSA4PNy7CY3woqZ+6 sFP0fCz+wcdilEMoFsV8PdvPVZQtcF9R2bkwU1w980D5aVqbMEwXqPUwRKENoKCU3QRs c48O1PMuwjjgHZkOT/Tm9fM5W8guoMBQwYkfuYLyOnEUArqfQyqETxv/MdjjZ2RKIuE1 YcmA== X-Gm-Message-State: AOJu0Yy08eK6Dtu5TLu5vKNJwgh/tF8lxFMmPKYZYvrhSMfYnk1Oyyr9 k8m3P2yzjJfHsDyhNYxcJLnw5g== X-Received: by 2002:a05:6a20:8409:b0:159:b45e:1c7d with SMTP id c9-20020a056a20840900b00159b45e1c7dmr331120pzd.15.1695405044050; Fri, 22 Sep 2023 10:50: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 k17-20020aa78211000000b0068be4ce33easm3556666pfi.96.2023.09.22.10.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:50:43 -0700 (PDT) From: Kees Cook To: Jaroslav Kysela Cc: Kees Cook , Takashi Iwai , Cezary Rojewski , alsa-devel@alsa-project.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , Kai Vehmanen , Jason Montleon , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] ALSA: hda: Annotate struct hda_conn_list with __counted_by Date: Fri, 22 Sep 2023 10:50:42 -0700 Message-Id: <20230922175042.work.547-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1166; i=keescook@chromium.org; h=from:subject:message-id; bh=2+WFGivuUVAKb1W+9E3ktp6XUMEEm32AWq2NC2ISBJg=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdPyOwKNuU3DBxwepcnIO9oHljCgGuE/kMNNW SIuGoQNj8SJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3T8gAKCRCJcvTf3G3A Jo+WD/9F+wyEdMZRixRxq25YvGH8mw+aR+YpOV3Jnt0ScoGqx0BVe0PCT0yiRIlirDR/leDv/w8 f7dQOHwxs6N9HFxhaKWBn/5fS39ICNQHC6rGWyVsrtVhQomA7J2VerZJ3EHX1Py8vAQ45YeksaK 68AiMW/ZxVcB2VQVOV9JK2LLA8q1GDFaSzTX25NBCsilUpoA4Xg2zoxf99DJqx4M4DEcYMvA8dx P+iFCootNqc75w1qhByYrkec6Ypk9186+KIEpX23pJvVkkOnm+l4jFmeAc6fDGLx4GGyVGf7oBF bbuUPvR9ftPa8SdqnefuqXk6wUxPKdb94b6/PnBWLs8O87U+ug0Nkh5oYTMTOEp/cfyM7Aj3lT1 HrZA5MhV2tsVVK2LMCLeFmqxZBfw/XJal0TYdzkGV7Y5HGrF3yDBqnAdJW4/uZeL9psk2L0ptaN L/SvDMIi0e7Jmwu580DQfxp4N23uZcYYDQNVFdCMuE+NSTggdbiilocOwMPL5ypkjb9X/boktW5 tzYNjZsA3ZGXjSwzW61MmJOC52NSPC6Tk0bOHBbzVQfJGJUVVG8Q0uBN5PkgRtuVrc8oh4zUF5Z ILsCXDzpDzwULkvGXjOBJv5tUcenHcoyf4qbL5mC9nHz9RbDqdz0MnmL9tLf7L5LBNwVdJAyQpX sITrZ/3 7N36Rc8A== 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:52:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777767472873289518 X-GMAIL-MSGID: 1777767472873289518 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 hda_conn_list. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Cezary Rojewski Cc: alsa-devel@alsa-project.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- sound/pci/hda/hda_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 33af707a65ab..01718b1fc9a7 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -88,7 +88,7 @@ struct hda_conn_list { struct list_head list; int len; hda_nid_t nid; - hda_nid_t conns[]; + hda_nid_t conns[] __counted_by(len); }; /* look up the cached results */