Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2239092ybg; Sun, 27 Oct 2019 14:08:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4aYe0mBAZi6nhI8YQz136SIYxaWayotRe8/jPpXd5B1+z9YV8B2KioJzxnwSUBYRszCUz X-Received: by 2002:a50:b6f8:: with SMTP id f53mr16017808ede.29.1572210509942; Sun, 27 Oct 2019 14:08:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572210509; cv=none; d=google.com; s=arc-20160816; b=sEUjeWkasN6IwVZWnxNHXRcMqvLJGvhRqWlLbHoZmyH4be5I0VzJQ2Hq7GhPcGH2FH cXjh1+yv1YDoqfTM5vN/pv0MVB8GtHd1VEr7Wh+uHCwUvwWLllrm0jvnmG5QIo/N3HTj LzGgfWnMxGMucuOxtfO5a5DwYHjfomBABtMvlo4mYmvVLoFMh3DSnsjKqKj9uYUzLMM/ otkSTFGEIMdSFj1s5bJIHChUp2kdmGBCPW+pLEKwTUs32INLvSnbaF4LwjS1qvGyZ5OW a34CVev4z5SVKjWTeYWfhR9xPZIegU8G+Xd6X8L2fjKZeP2I4DkJbWKuQhgvVASkmtiK E/Nw== 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=OJL64XilTB++1xK+Gmb+RBwwGEIdSVMnAQqjtrtHWTU=; b=PM5YryKF3+WSPvLtHBQ44JMYGPbzqAIx6TE4fIyd5lxvU8AQrpL2QPMDiqF41VgUGZ 6rt7neT6hkhuQ32Qa427TfNDZLTBLKBfPZKb+81pJUSbvYVNO4zVHnNG9wMNKpzYHP/T 7JS5j6UEI/dJaCyOXV+7eAfLX94WEbavPuqRwUAxzyDShnSWTTGFj1zl52ptLIDCT2WZ B0mFeNlgzno7SoKetv4ZyU/c6d4Q364CSHNwZQ3omddfgafR7oEnezqGMaDeTQwIkyRG e5McCzFa0+oNfK1slwsMrTUaNGcRnFiP/9227F+n/TBBvCXkrxtc67xYK4AOyQkmZfbv Kh7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tOEQbl8U; 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 k15si5065177eja.412.2019.10.27.14.08.06; Sun, 27 Oct 2019 14:08:29 -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=tOEQbl8U; 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 S1727725AbfJ0VGk (ORCPT + 99 others); Sun, 27 Oct 2019 17:06:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:52552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727243AbfJ0VGg (ORCPT ); Sun, 27 Oct 2019 17:06:36 -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 71C252184C; Sun, 27 Oct 2019 21:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210396; bh=K/Hv0ZNiEvNWDdGPSx+8l53LUVoMSq0p84Lvr/p26sQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tOEQbl8U0AfxlHlvcAUX5iNuQPEWUuRqzRS6BRshkRSUa9jlxD/zxkeF9583WWiet RGAOIvALn5fcXCxKU4uYT4q3LUXf8/CDXWlmkylk682uEYqs/9Cs3mZrjyf5MytFjL CZWH4H/c41EDw4dM7b44CHUZq3GTKku+HM7C4frA= 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 35/49] cfg80211: wext: avoid copying malformed SSIDs Date: Sun, 27 Oct 2019 22:01:13 +0100 Message-Id: <20191027203150.939060995@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 4ac2813cc867ae563a1ba5a9414bfb554e5796fa upstream. Ensure the SSID element is bounds-checked prior to invoking memcpy() with its length field, when copying to userspace. Cc: Cc: Kees Cook Reported-by: Nicolas Waisman Signed-off-by: Will Deacon Link: https://lore.kernel.org/r/20191004095132.15777-2-will@kernel.org [adjust commit log a bit] Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/wireless/wext-sme.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/net/wireless/wext-sme.c +++ b/net/wireless/wext-sme.c @@ -224,6 +224,7 @@ int cfg80211_mgd_wext_giwessid(struct ne struct iw_point *data, char *ssid) { struct wireless_dev *wdev = dev->ieee80211_ptr; + int ret = 0; /* call only for station! */ if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION)) @@ -241,7 +242,10 @@ int cfg80211_mgd_wext_giwessid(struct ne if (ie) { data->flags = 1; data->length = ie[1]; - memcpy(ssid, ie + 2, data->length); + if (data->length > IW_ESSID_MAX_SIZE) + ret = -EINVAL; + else + memcpy(ssid, ie + 2, data->length); } rcu_read_unlock(); } else if (wdev->wext.connect.ssid && wdev->wext.connect.ssid_len) { @@ -251,7 +255,7 @@ int cfg80211_mgd_wext_giwessid(struct ne } wdev_unlock(wdev); - return 0; + return ret; } int cfg80211_mgd_wext_siwap(struct net_device *dev,