Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2260885ybg; Sun, 27 Oct 2019 14:38:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqyyLlrdWn20Cy+P6zxlBeq/fFTvXKh8ATbHVFU0CcPzXlFF54I57P0Y1Ki88Akzc3EyK8z3 X-Received: by 2002:a17:906:bceb:: with SMTP id op11mr14258710ejb.197.1572212307040; Sun, 27 Oct 2019 14:38:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572212307; cv=none; d=google.com; s=arc-20160816; b=Bm9BZbS3GvXLeKSMZxOxIPIobNW+0szcC7spQpQDef8X6c7kL6gSZ2YrEyMGYt8MaU R0nMQOboKojU3QQGUQPYXDFMPkneWTo+jdXl4xZF5onXekqmflryyXHMORMQBfZL1BIT w4CX2cVEaZC0q9QFp0Tqkn86MsweNsY7SKP8mzUtbkxF6OFu0wuq3lM731Utv70cZfnl HazDWDnIpWELUiK8GIVBUrFqeyZXXkihFD/bU3/foo2kWhZEK5lMxJR2XXsAwGDGueP7 d0Pvy2w07sQ/lxQy1mhPfWcpRmyuSSPGgZ5I1Dz/DBPuVvCtD3r+UjsAzgXnzHUvmAYU zUcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CLN8E0GOBl13jRClAHe+OvinvV8uURjfo4NA4ZQShmE=; b=SXnoKmOTgRLROu6DPaCuija/re4msi/ijHjgRurgLvPQSjjkG3oSAOCyaW6DRQlzQy Z+YcHl0N/6JmHBvHZdlnc+z/PF1s38UtM17WA0TtFwrdLfDtIdNB3EYbVUuqFvd+ulBp UWU5tiE9bbXbcSE1gRsZUlu7nd9VlUeG7g3mekX9VGSQ4BSByGC9y4/1oQjowYpy6aQ1 rownypSSLr7yQlOz+azfK+MvpbYXAknHX4OmFFijQj+nvld3iUewVA7lCqZM0oNIrSuf t9OKGzDLk5x09yZDjOFGX6+IDuERZTI93t9BxNkh/JS+ODQ38Y3M5Ga1v3ZoVL3ANLzk GoJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nmsddOP7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o22si5278891ejm.429.2019.10.27.14.38.03; Sun, 27 Oct 2019 14:38:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nmsddOP7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728711AbfJ0VGp (ORCPT + 99 others); Sun, 27 Oct 2019 17:06:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:52596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727702AbfJ0VGj (ORCPT ); Sun, 27 Oct 2019 17:06:39 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5E1042064A; Sun, 27 Oct 2019 21:06:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210398; bh=uw4FsbykKvY5mRQRdXpS59+P12ELhRHDs100pawlrWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nmsddOP73VcrHXoc6fCyzitqY25qczk0kODTP7XGTAvWCSN6OrtQLMGsxKDgZcbeU bRev7u0V8l0WPPGD9nJUU9ZAZ2Xktv5ZTjTV7xPtjzThhpGRIc/1kXoq8rKD8wYwz7 Aew2S0H4Rgdv6Qq3jjaWjaaH8u4FhakEfnWwRxBw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook , Nicolas Waisman , Will Deacon , Johannes Berg Subject: [PATCH 4.9 36/49] mac80211: Reject malformed SSID elements Date: Sun, 27 Oct 2019 22:01:14 +0100 Message-Id: <20191027203152.366352267@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Will Deacon commit 4152561f5da3fca92af7179dd538ea89e248f9d0 upstream. Although this shouldn't occur in practice, it's a good idea to bounds check the length field of the SSID element prior to using it for things like allocations or memcpy operations. Cc: Cc: Kees Cook Reported-by: Nicolas Waisman Signed-off-by: Will Deacon Link: https://lore.kernel.org/r/20191004095132.15777-1-will@kernel.org Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/mlme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2434,7 +2434,8 @@ struct sk_buff *ieee80211_ap_probereq_ge rcu_read_lock(); ssid = ieee80211_bss_get_ie(cbss, WLAN_EID_SSID); - if (WARN_ON_ONCE(ssid == NULL)) + if (WARN_ONCE(!ssid || ssid[1] > IEEE80211_MAX_SSID_LEN, + "invalid SSID element (len=%d)", ssid ? ssid[1] : -1)) ssid_len = 0; else ssid_len = ssid[1]; @@ -4691,7 +4692,7 @@ int ieee80211_mgd_assoc(struct ieee80211 rcu_read_lock(); ssidie = ieee80211_bss_get_ie(req->bss, WLAN_EID_SSID); - if (!ssidie) { + if (!ssidie || ssidie[1] > sizeof(assoc_data->ssid)) { rcu_read_unlock(); kfree(assoc_data); return -EINVAL;