From nobody Thu Aug 18 20:31:44 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M7xPX4SGtz4ZFQ1; Thu, 18 Aug 2022 20:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M7xPX3n9Mz3fwq; Thu, 18 Aug 2022 20:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660854704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nNV5UpLsv85j4xsZudW1TxZpkcO8F7yso8ZL9CMacsM=; b=f9/1sagpivRSaqhZmrxx1+qLxhD10eaBKIpWm/aIhgkA1vlUTyyodJYAE6lHS6mT1U1Zok 2B5qpgnkJ/AMT3VhhJRC3FiX4NHUDJHv1iDYfkW+c3yqD/95keuzvvWnaPOjykvsvQ3b6w kpERWk9RVLr2XdbYK4tY7LgKcZ6AiApZf/wcsCxCdYuv3203e7J59Bd8hlT8cTI7jW1fiG B8NB4kweIxo3sZGFi1451bSQgi9Rhxij51yRel/RxHmLjxogtXLgYvi+HV5/FKFtrX0g+Z WSsMrP1tAFSqJPAPQrjVHT0F6CaRoJ/0023o7ghoRk2lw9n5R8zCSOg3D+H1Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M7xPX2rn4zRnK; Thu, 18 Aug 2022 20:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27IKViPP083410; Thu, 18 Aug 2022 20:31:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27IKViS0083409; Thu, 18 Aug 2022 20:31:44 GMT (envelope-from git) Date: Thu, 18 Aug 2022 20:31:44 GMT Message-Id: <202208182031.27IKViS0083409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9d2ba51806c3 - main - net80211: ieee80211_ies_expand() add extra length check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d2ba51806c32e7ea8ad83439cb48df91575b5bf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660854704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nNV5UpLsv85j4xsZudW1TxZpkcO8F7yso8ZL9CMacsM=; b=wX3KYZdOPsV3CtDGFIVZq5S/mwugH4kS5pI5N2Zmr/w7FbJqKjvJ483lzqs2f2O60hcfrY sH2FYm9Ts04bP2rcGqjrA/wAgr6XWva1jTBt2XRer3AdJmDqMWDNbjH7fRbn9TG0YfELmm gtwTbMrcZEUtu+rHNoB40K2JmqEyGMzuTCu4Gu+vuSoSkm18xiZqo5DBO3Hc5ldQb9OHkc gIRwNLfuwLhnQJUSZwQhFas/tLrcYa8yubFZbsG8SAfJFE/cJdf24/L6KzeeRtU05TRjUo RzN+11x2Ud+53npFpCmdROcEXWUptq8dveK7l2OUrKS5/n+x95F4D5dk7dCFGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660854704; a=rsa-sha256; cv=none; b=fVTdjA1J9uwvW74/XH2H7GvCIyzIgQnmBRFVVsuZAHNkr9xM06kj0P8mDslbxcrjOhaEnF r9V1ta65e57LHBxnin1WT1MOsMddAgLaNjvNWBlcdqjczFFsZDl+M+eCV1ksYhgdJGKrid Mxn7otYFqS8TCpXc5P73G4UxSlcKgv5mxLzxJ2M1S9pe6pu/vhOlbXx92zT16MJ5xYHzMY r8zb2OdfgmIaXLzSroSlCbxtqFLx5Q8hs/Chh4yWIotiQPWrJE7kg9yOvj1Qq6jp3fPZV6 +iuaoJoSe+lYbBUCsc7hcJnNSuiqaFlwLZZoMFQxXWWS6WOCesp2ZNKKIfBlRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9d2ba51806c32e7ea8ad83439cb48df91575b5bf commit 9d2ba51806c32e7ea8ad83439cb48df91575b5bf Author: Bjoern A. Zeeb AuthorDate: 2022-08-17 16:48:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-08-18 20:29:25 +0000 net80211: ieee80211_ies_expand() add extra length check Make sure the given IE length fits into the total length left when parsing through the information elements. In theory I would say discard everything if there is an error but that proves hard with the current code. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D36245 --- sys/net80211/ieee80211_node.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index a739b0586088..bc8a240811de 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1137,6 +1137,14 @@ ieee80211_ies_expand(struct ieee80211_ies *ies) ie = ies->data; ielen = ies->len; while (ielen > 1) { + /* Make sure the given IE length fits into the total length. */ + if ((2 + ie[1]) > ielen) { + printf("%s: malformed IEs! ies %p { data %p len %d }: " + "ie %u len 2+%u > total len left %d\n", + __func__, ies, ies->data, ies->len, + ie[0], ie[1], ielen); + return; + } switch (ie[0]) { case IEEE80211_ELEMID_VENDOR: if (iswpaoui(ie))