From: Kees Cook <keescook@chromium.org>
To: Will Deacon <will@kernel.org>
Cc: linux-wireless@vger.kernel.org, nico@semmle.com,
stable@vger.kernel.org, Johannes Berg <johannes@sipsolutions.net>
Subject: Re: [PATCH 2/2] cfg80211: wext: Reject malformed SSID elements
Date: Fri, 4 Oct 2019 08:56:08 -0700 [thread overview]
Message-ID: <201910040856.C85EDF91@keescook> (raw)
In-Reply-To: <20191004095132.15777-2-will@kernel.org>
On Fri, Oct 04, 2019 at 10:51:32AM +0100, Will Deacon wrote:
> Ensure the SSID element is bounds-checked prior to invoking memcpy()
> with its length field.
>
> Cc: <stable@vger.kernel.org>
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Cc: Kees Cook <keescook@chromium.org>
> Reported-by: Nicolas Waisman <nico@semmle.com>
> Signed-off-by: Will Deacon <will@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
-Kees
> ---
> net/wireless/wext-sme.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
> index c67d7a82ab13..3fd2cc7fc36a 100644
> --- a/net/wireless/wext-sme.c
> +++ b/net/wireless/wext-sme.c
> @@ -201,6 +201,7 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev,
> struct iw_request_info *info,
> struct iw_point *data, char *ssid)
> {
> + int ret = 0;
> struct wireless_dev *wdev = dev->ieee80211_ptr;
>
> /* call only for station! */
> @@ -219,7 +220,10 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev,
> 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 net_device *dev,
> }
> wdev_unlock(wdev);
>
> - return 0;
> + return ret;
> }
>
> int cfg80211_mgd_wext_siwap(struct net_device *dev,
> --
> 2.23.0.581.g78d2f28ef7-goog
>
--
Kees Cook
next prev parent reply other threads:[~2019-10-04 15:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-04 9:51 [PATCH 1/2] mac80211: Reject malformed SSID elements Will Deacon
2019-10-04 9:51 ` [PATCH 2/2] cfg80211: wext: " Will Deacon
2019-10-04 15:56 ` Kees Cook [this message]
2019-10-04 15:55 ` [PATCH 1/2] mac80211: " Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201910040856.C85EDF91@keescook \
--to=keescook@chromium.org \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=nico@semmle.com \
--cc=stable@vger.kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).