From patchwork Wed Dec 10 19:14:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 5471671 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0707B9F444 for ; Wed, 10 Dec 2014 19:29:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4AFF020173 for ; Wed, 10 Dec 2014 19:29:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F75220160 for ; Wed, 10 Dec 2014 19:29:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932777AbaLJT3l (ORCPT ); Wed, 10 Dec 2014 14:29:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38744 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932319AbaLJT3l (ORCPT ); Wed, 10 Dec 2014 14:29:41 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBAJTVVW008045 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 10 Dec 2014 14:29:38 -0500 Received: from ultrasam.trained-monkey.org ([10.15.49.233]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sBAJE8qo019903; Wed, 10 Dec 2014 14:14:08 -0500 Received: from ultrasam.lan.trained-monkey.org (localhost [127.0.0.1]) by ultrasam.trained-monkey.org (Postfix) with ESMTP id E950F819756B; Wed, 10 Dec 2014 14:14:07 -0500 (EST) From: Jes.Sorensen@redhat.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Jes Sorensen Subject: [PATCH 1/1] wireless: mac80211: Avoid using uninitialized stack data Date: Wed, 10 Dec 2014 14:14:07 -0500 Message-Id: <1418238847-3332-2-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1418238847-3332-1-git-send-email-Jes.Sorensen@redhat.com> References: <1418238847-3332-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jes Sorensen Avoid case where we would access uninitialized stack data if a driver advertises HT support without 40MHz channel support. Signed-off-by: Jes Sorensen --- net/mac80211/mlme.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 93af0f1..da1f639 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -174,6 +174,7 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, if (!(ht_cap->cap_info & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40))) { ret = IEEE80211_STA_DISABLE_40MHZ; + vht_chandef = *chandef; goto out; }