From patchwork Thu Sep 14 07:02:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 139519 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp281503vqi; Thu, 14 Sep 2023 04:37:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDZjlnGrRxJ7orEFIyUxAytqLsyODsuP9YsspuMTpiNZFmAozRoV1Vjptcb7gresBkWrf3 X-Received: by 2002:a05:6358:15d1:b0:134:fdfc:4319 with SMTP id t17-20020a05635815d100b00134fdfc4319mr5396127rwh.20.1694691446239; Thu, 14 Sep 2023 04:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694691446; cv=none; d=google.com; s=arc-20160816; b=ze61Wg0+CSbMnS/KkbX1bY+uaLmPjtj7o66xkjf6/AJfUBJn2PV3hXsWZiP62dSE1S /J175cYDa1eXoJYVPdw8Db2lYZ0c4jCvbSYSn/wqViH5h6EKRGXd/fRiQz2FHie5VxNY 1tlmidNoWZmrylAhJ2Pd3r3K+fHexWpV78tx9S6acpatCEKFsC3lBW5MhBDIQkFDaRer 7fEWs3Z8Z6Gc5+V+FtEwPY8pHvsGDfHI+fjt7djkw5CjlEnrP1hhD02uRaUbHtu7psmC tOAES733vmYcbs3pOzzufWrUMV202yHQhGyGat+Y6hReXD7UJ/NafBfIj5LZsqKFPDKZ 8aww== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=goSxu7HgsxTeodjXmJUH/TuD0k0hgtAzYq7xYOspA+4=; fh=6HOVc2HOEFG69Xgx0J7PvjCTzID0Y0XJIPUWqgOY8+Q=; b=sUXV17Nx0SFqooI99HmEMurA7s6AibgjrLc/xv8yBDhp06tx6OpoHXyIOInJLfJQPJ 33VWdcH/iqe0b8NYAktzce88xfHPkVoF7eV5qiDdnwAb1yHM48mTMYg5DGZzLZfFysTg QlOSvobvg78TOcdgPxPj5i7sa1mlotINol1reo88hYGLIowJRwl7qXt6ZhT7R3pudigw FxVnqio5TPMHyT+T78GkYRRUhCYfZwMzUOdYYRMCZt28OLR4zlc+TzALfJDzuy70gjB8 2CEiataDYFrqI3D/ehdaajBTXrNpVGNyEl6fPJZ+ZoZxJoyT0HtCikGbCNkifinLuvz7 P8SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=WDk8FWMN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id t4-20020a63f344000000b0057416a797ebsi1357728pgj.12.2023.09.14.04.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 04:37:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=WDk8FWMN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id A9946829F666; Thu, 14 Sep 2023 00:03: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 S235381AbjINHDb (ORCPT + 35 others); Thu, 14 Sep 2023 03:03:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232119AbjINHD3 (ORCPT ); Thu, 14 Sep 2023 03:03:29 -0400 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36EE6BD for ; Thu, 14 Sep 2023 00:03:25 -0700 (PDT) Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 08E273F672 for ; Thu, 14 Sep 2023 07:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1694675002; bh=goSxu7HgsxTeodjXmJUH/TuD0k0hgtAzYq7xYOspA+4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WDk8FWMNg5jCyhP66uwB/GzZoWK53265q8Nh/hjEvdwTi4QTZhb/JgAi75PLin8wm vzJFFV0/JfHF7m5U4DM61117z60pWT7oCKUktAFXkBdZUTAGStCOyHPDTu8uk1FQN3 roMJ6Aaf7TWs5BSG0zWmMRWFYhsmVNgh3EnaMefNq4OBB4R9h7MzBi9hougcLdPhI1 QcGTzbpSXSk92+fmLDo3ddWaDDvo1eYJ2p9KDq0Fxnadcj1dVMY0FODKE4iidExKwz wFZWdm/plh+NKKbf2BSYbEGr+lqXdOgnlN9uiX8zB725I0yof9xFKOcK7OgWWiXOUv oV6on9m27CVdg== Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2bd132e84b2so7954461fa.0 for ; Thu, 14 Sep 2023 00:03:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694675001; x=1695279801; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=goSxu7HgsxTeodjXmJUH/TuD0k0hgtAzYq7xYOspA+4=; b=Hn7OApw0lQlazWhyPgaMj1ffGbUKMshOFtGnwGFX8BvgrGejjg74fGMJINwPk8UlZq vnEY1+cJWPic6xaUyOO5XrSMrCk+ONDYyEzQ9L/8w+xObinv2FJNKMGMu+vif5o8cixi 2tRcRHRWFaM5u/214sOoCd/ddxju57XLbPcPgy1WXIgMa8i6dMBGyFRYkjGSBB3QxirW SGbd7At49WrlvL+iOlpJovlOrR3YKOBaSKJqWNMmoMiClnkC5qaL16ISdfFCGMZuNaeb HPpQw1Q/7PiD+OGqj28cYYxSm4IpOL2QbEyQ5glEUjQINHJhRh7rdZCUmqX87WhM/OAw VuwQ== X-Gm-Message-State: AOJu0YwjyH2Jb0lDP7KgeSQ8/SJJAs8ZTko2QLgdOTE7/2LPrHC4zcL3 hkquaOQKh6yvswI3B4QPYFB6JhgR0pTyfqyw0WFriUBTLDmnGdnNF9u7OpaFlBbGnw0oRql3fB9 U5jmeQSHQ6+ZIAPvqmyKdX7VTUM3Dnqv9UsqKXezSWg== X-Received: by 2002:a2e:9ed9:0:b0:2bc:e32f:6fb0 with SMTP id h25-20020a2e9ed9000000b002bce32f6fb0mr4263143ljk.9.1694675000782; Thu, 14 Sep 2023 00:03:20 -0700 (PDT) X-Received: by 2002:a2e:9ed9:0:b0:2bc:e32f:6fb0 with SMTP id h25-20020a2e9ed9000000b002bce32f6fb0mr4263113ljk.9.1694675000394; Thu, 14 Sep 2023 00:03:20 -0700 (PDT) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id y14-20020a7bcd8e000000b004030e8ff964sm3981698wmj.34.2023.09.14.00.03.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 00:03:19 -0700 (PDT) From: Juerg Haefliger To: juerg.haefliger@canonical.com Cc: SHA-cyfmac-dev-list@infineon.com, aspriel@gmail.com, brcm80211-dev-list.pdl@broadcom.com, franky.lin@broadcom.com, gustavoars@kernel.org, hante.meuleman@broadcom.com, hdegoede@redhat.com, keescook@chromium.org, kvalo@kernel.org, linus.walleij@linaro.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, marcan@marcan.st, ryohei.kondo@cypress.com, stable@vger.kernel.org Subject: [PATCH v2] wifi: brcmfmac: Replace 1-element arrays with flexible arrays Date: Thu, 14 Sep 2023 09:02:27 +0200 Message-Id: <20230914070227.12028-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230913065421.12615-1-juerg.haefliger@canonical.com> References: <20230913065421.12615-1-juerg.haefliger@canonical.com> MIME-Version: 1.0 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]); Thu, 14 Sep 2023 00:03:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776912175466163351 X-GMAIL-MSGID: 1777012777558621970 Since commit 2d47c6956ab3 ("ubsan: Tighten UBSAN_BOUNDS on GCC"), UBSAN_BOUNDS no longer pretends 1-element arrays are unbounded. Walking 'element' and 'channel_list' will trigger warnings, so make them proper flexible arrays. False positive warnings were: UBSAN: array-index-out-of-bounds in drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:6984:20 index 1 is out of range for type '__le32 [1]' UBSAN: array-index-out-of-bounds in drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:1126:27 index 1 is out of range for type '__le16 [1]' for these lines of code: 6884 ch.chspec = (u16)le32_to_cpu(list->element[i]); 1126 params_le->channel_list[i] = cpu_to_le16(chanspec); Cc: stable@vger.kernel.org # 6.5+ Signed-off-by: Juerg Haefliger Reviewed-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- v2: - Use element[] instead of DFA() in brcmf_chanspec_list. - Add Cc: stable tag --- .../wireless/broadcom/brcm80211/brcmfmac/fwil_types.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h index bece26741d3a..611d1a6aabb9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h @@ -442,7 +442,12 @@ struct brcmf_scan_params_v2_le { * fixed parameter portion is assumed, otherwise * ssid in the fixed portion is ignored */ - __le16 channel_list[1]; /* list of chanspecs */ + union { + __le16 padding; /* Reserve space for at least 1 entry for abort + * which uses an on stack brcmf_scan_params_v2_le + */ + DECLARE_FLEX_ARRAY(__le16, channel_list); /* chanspecs */ + }; }; struct brcmf_scan_results { @@ -702,7 +707,7 @@ struct brcmf_sta_info_le { struct brcmf_chanspec_list { __le32 count; /* # of entries */ - __le32 element[1]; /* variable length uint32 list */ + __le32 element[]; /* variable length uint32 list */ }; /*