Attachment 306841 Details for Bug 448261 – 0001-rtl8180-avoid-NULL-dereference-in-max2820_rf_set_ch.patch

[patch] 0001-rtl8180-avoid-NULL-dereference-in-max2820_rf_set_ch.patch

0001-rtl8180-avoid-NULL-dereference-in-max2820_rf_set_ch.patch (text/plain), 1.44 KB, created by John W. Linville on 2008-05-27 21:07:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. Linville

Created: 2008-05-27 21:07:23 UTC

Size: 1.44 KB

patch

obsolete

>From 0592999582499048bb64e3f7a078929cb8cf28a5 Mon Sep 17 00:00:00 2001
>From: John W. Linville <linville@tuxdriver.com>
>Date: Tue, 27 May 2008 17:01:55 -0400
>Subject: [PATCH] rtl8180: avoid NULL dereference in max2820_rf_set_channel
>
>The static function max2820_rf_set_channel is called with conf == NULL
>within its compilation unit.  Originally this defaulted to b/g channel
>1, but "cfg80211 API for channels/bitrates, mac80211 and driver
>conversion" (commit 8318d78a44d49ac1edf2bdec7299de3617c4232e) mistakenly
>dropped this check.  This patch minimally restores the expected
>behavior.
>
>Reported-by: Colin Lai <colin_sh@163.com>
>Signed-off-by: John W. Linville <linville@tuxdriver.com>
>---
> drivers/net/wireless/rtl8180_max2820.c |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/drivers/net/wireless/rtl8180_max2820.c b/drivers/net/wireless/rtl8180_max2820.c
>index a34dfd3..a140c80 100644
>--- a/drivers/net/wireless/rtl8180_max2820.c
>+++ b/drivers/net/wireless/rtl8180_max2820.c
>@@ -78,7 +78,8 @@ static void max2820_rf_set_channel(struct ieee80211_hw *dev,
> 				   struct ieee80211_conf *conf)
> {
> 	struct rtl8180_priv *priv = dev->priv;
>-	int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
>+	int channel = conf ?
>+		ieee80211_frequency_to_channel(conf->channel->center_freq) : 1;
> 	unsigned int chan_idx = channel - 1;
> 	u32 txpw = priv->channels[chan_idx].hw_value & 0xFF;
> 	u32 chan = max2820_chan[chan_idx];
>-- 
>1.5.4.5
>

Actions: View | Diff

Attachments on bug 448261: 306841