From patchwork Mon Jul 27 14:34:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John W. Linville" X-Patchwork-Id: 37538 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6REkEXB005330 for ; Mon, 27 Jul 2009 14:46:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751451AbZG0OqB (ORCPT ); Mon, 27 Jul 2009 10:46:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751426AbZG0OqB (ORCPT ); Mon, 27 Jul 2009 10:46:01 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:39531 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751392AbZG0OqA (ORCPT ); Mon, 27 Jul 2009 10:46:00 -0400 Received: from uucp by smtp.tuxdriver.com with local-rmail (Exim 4.63) (envelope-from ) id 1MVRSh-0005U4-ET; Mon, 27 Jul 2009 10:45:59 -0400 Received: from linville-t400.local (linville-t400.local [127.0.0.1]) by linville-t400.local (8.14.3/8.14.3) with ESMTP id n6REYglv009984; Mon, 27 Jul 2009 10:34:42 -0400 Received: (from linville@localhost) by linville-t400.local (8.14.3/8.14.3/Submit) id n6REYgFE009982; Mon, 27 Jul 2009 10:34:42 -0400 From: "John W. Linville" To: linux-wireless@vger.kernel.org Cc: ettl.martin@gmx.de, "John W. Linville" Subject: [PATCH] ray_cs: avoid potential null dereference in ray_get_wireless_stats Date: Mon, 27 Jul 2009 10:34:42 -0400 Message-Id: <1248705282-9951-1-git-send-email-linville@tuxdriver.com> X-Mailer: git-send-email 1.6.2.5 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org http://bugzilla.kernel.org/show_bug.cgi?id=13854 Reported-by: Martin Ettl Signed-off-by: John W. Linville --- drivers/net/wireless/ray_cs.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 698b11b..a4308a6 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -1508,11 +1508,13 @@ static int ray_commit(struct net_device *dev, struct iw_request_info *info, /* N static iw_stats *ray_get_wireless_stats(struct net_device *dev) { ray_dev_t *local = netdev_priv(dev); - struct pcmcia_device *link = local->finder; - struct status __iomem *p = local->sram + STATUS_BASE; + struct pcmcia_device *link; + struct status __iomem *p; if (local == (ray_dev_t *) NULL) return (iw_stats *) NULL; + link = local->finder; + p = local->sram + STATUS_BASE; local->wstats.status = local->card_status; #ifdef WIRELESS_SPY