From patchwork Fri Oct  8 18:25:38 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Javier Cardona <javier@cozybit.com>
X-Patchwork-Id: 242031
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o98IQ1Rn021229
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Fri, 8 Oct 2010 18:26:01 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751923Ab0JHS0A (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Fri, 8 Oct 2010 14:26:00 -0400
Received: from mail-qw0-f46.google.com ([209.85.216.46]:47208 "EHLO
	mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751741Ab0JHSZ7 convert rfc822-to-8bit (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Fri, 8 Oct 2010 14:25:59 -0400
Received: by qwf7 with SMTP id 7so805265qwf.19
	for <linux-wireless@vger.kernel.org>;
	Fri, 08 Oct 2010 11:25:59 -0700 (PDT)
Received: by 10.229.141.65 with SMTP id l1mr2305178qcu.166.1286562358986;
	Fri, 08 Oct 2010 11:25:58 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.229.101.208 with HTTP; Fri, 8 Oct 2010 11:25:38 -0700 (PDT)
In-Reply-To: <1286560985.3612.12.camel@jlt3.sipsolutions.net>
References: <201009210057.13297.chunkeey@googlemail.com>
	<20100924180013.GD8077@tuxdriver.com>
	<201009250002.21219.chunkeey@googlemail.com>
	<AANLkTinCkWGs_KMz+QBUw2J5HUVU2hK1+8kVDr_PNZwP@mail.gmail.com>
	<1286492072.20974.49.camel@jlt3.sipsolutions.net>
	<AANLkTin6nwrhcGdnGxg_gMGSrD_GBc-R51qiendF4iAc@mail.gmail.com>
	<1286560985.3612.12.camel@jlt3.sipsolutions.net>
From: Javier Cardona <javier@cozybit.com>
Date: Fri, 8 Oct 2010 11:25:38 -0700
Message-ID: <AANLkTikXeA=Q5C84-aaZeq1+vR8vFdXEEe5GyQfCDqr1@mail.gmail.com>
Subject: Re: [RFC v2] mac80211: fix possible null-pointer dereference
To: Johannes Berg <johannes@sipsolutions.net>
Cc: Steve deRosier <steve@cozybit.com>,
	Christian Lamparter <chunkeey@googlemail.com>,
	"John W. Linville" <linville@tuxdriver.com>,
	Luis Carlos Cobo <luisca@cozybit.com>, linux-wireless@vger.kernel.org
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 08 Oct 2010 18:26:02 +0000 (UTC)


diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index ea13a80..8b7efee 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -412,7 +412,7 @@ void mesh_rx_plink_frame(struct
ieee80211_sub_if_data *sdata, struct ieee80211_m
       enum plink_event event;
       enum plink_frame_type ftype;
       size_t baselen;
-       bool deactivated;
+       bool deactivated, matches_local = true;
       u8 ie_len;
       u8 *baseaddr;