Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2251424ybg; Sun, 27 Oct 2019 14:24:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqynhIKdoAJsczNrS9xIkfxL7ywdJgd1hA9nNmWh8IrB//cVdSNmBSF6HOoCzNbB1b0cR6O1 X-Received: by 2002:a50:aad2:: with SMTP id r18mr16380389edc.44.1572211476424; Sun, 27 Oct 2019 14:24:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211476; cv=none; d=google.com; s=arc-20160816; b=tgulVXp3ip9BTr/kco7Wtn9HW2r5fY/Crc/4kD7SHehGMOKzcQQ2eUSUU7Lt0pOyuG SE6oYUzDRmYHpIHcb8fChmSYNAMDHvSgMBndB2FDiurptoj3lzH2F62eC+/B3iKEMOTY Y6nnwG3o8hCKB1HTmP4Vczvnt3qeND0fUk4niXGTon1rfVMHFry5zCgFmhtuSLOB+3OL 2533iG4jme5bAXGivY6YtvEVu/RId0FOC4bb9yaxIUZCWiaBkt8+B1bn1e0XhjdyKvST rIbSw7zcAjOIndvd5hMBthWY95T3/U4e8pN9I6aidgtxnfMDufk1kQsF5NfFUQ4y7Azc YCKg== 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=YyIrHpmS+Kp2fvbBUS8i9nDoZYuOEvZDGSHpd+PJ07Q=; b=ds6gD0MNpXcm+Q7r2TxII1KEu9AglHQs+44NUdi8Qx/+xErH5wHHGWTLg33QdqGigv lyX0cKAqLrwtuaGYsS7dATrnyiTRDmX64AQOaL/jyeu+aEfJCuQSknJ2KWKXNSkEUmad bZCnTwTffWp/6hTqBx6iYJTHajXE27J5BAyhl2rAa2USNrivuJztRi9qRC5uOQxQAN+I ryPkeeJ2IwQoIjAtEsrPpfNewE988rYSrB3g6YPeVpvmfHFwBqFI3PZdWrCk/lAttqLG 3i3KrMKXJ56bHiTDpzFj9ExFUvJL75UssUhyl3ZWzMi5NqpHRQn2zVJZ/4Ytfh7sZGRr VfmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="CeHKb/Os"; 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 e14si4819630ejq.406.2019.10.27.14.24.12; Sun, 27 Oct 2019 14:24:36 -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="CeHKb/Os"; 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 S1732208AbfJ0VWl (ORCPT + 99 others); Sun, 27 Oct 2019 17:22:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:43690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732193AbfJ0VWi (ORCPT ); Sun, 27 Oct 2019 17:22:38 -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 2DCDE205C9; Sun, 27 Oct 2019 21:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211357; bh=G8fdBiczYjP1dj+XAo4W0fgeejN6M3is5d/XqM9NW8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CeHKb/OsBAzZwnGM8B9m2eYMcMVVSlxlkPJ7PJhfntqiAPjwv7ag65XlvNmC0oxCW A7knKxx+GRFFarPIQzmjkuwXDnsKcvcc93W3M8VlNK+mHhuIifZQNpSjZuCl2QM0yC Itt9SRnxMGmAmEsNF4Q95BTAgx8BscnnMSNFiatA= 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 5.3 122/197] cfg80211: wext: avoid copying malformed SSIDs Date: Sun, 27 Oct 2019 22:00:40 +0100 Message-Id: <20191027203358.324038638@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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 @@ -202,6 +202,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)) @@ -219,7 +220,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) { @@ -229,7 +233,7 @@ int cfg80211_mgd_wext_giwessid(struct ne } wdev_unlock(wdev); - return 0; + return ret; } int cfg80211_mgd_wext_siwap(struct net_device *dev,