From patchwork Tue Jan 26 07:58:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 75153 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0Q7tkMI015314 for ; Tue, 26 Jan 2010 07:55:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752871Ab0AZHzk (ORCPT ); Tue, 26 Jan 2010 02:55:40 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752850Ab0AZHzk (ORCPT ); Tue, 26 Jan 2010 02:55:40 -0500 Received: from mga01.intel.com ([192.55.52.88]:62430 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752816Ab0AZHzk (ORCPT ); Tue, 26 Jan 2010 02:55:40 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 25 Jan 2010 23:54:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,344,1262592000"; d="scan'208";a="767337940" Received: from yzhu-mobl0.sh.intel.com (HELO localhost.localdomain) ([10.239.47.61]) by fmsmga001.fm.intel.com with ESMTP; 25 Jan 2010 23:55:36 -0800 From: Zhu Yi To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Zhu Yi , Johannes Berg , stable@kernel.org Subject: [PATCH] mac80211: fix NULL pointer dereference when ftrace is enabled Date: Tue, 26 Jan 2010 15:58:57 +0800 Message-Id: <1264492737-16877-1-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.0.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index fefa6e6..502424b 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h @@ -708,7 +708,7 @@ TRACE_EVENT(drv_ampdu_action, __entry->ret = ret; __entry->action = action; __entry->tid = tid; - __entry->ssn = *ssn; + __entry->ssn = ssn ? *ssn : 0; ), TP_printk(