netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] rt2x00: adjust EEPROM_SIZE for rt2500usb
@ 2015-08-10 22:25 Adrien Schildknecht
  2015-08-12  9:00 ` Stanislaw Gruszka
  2015-08-18  6:05 ` Kalle Valo
  0 siblings, 2 replies; 3+ messages in thread
From: Adrien Schildknecht @ 2015-08-10 22:25 UTC (permalink / raw)
  To: sgruszka, helmut.schaa, kvalo
  Cc: linux-wireless, netdev, linux-kernel, Adrien Schildknecht

rt2500usb_validate_eeprom() read data up to 0x6e (EEPROM_CALIBRATE_OFFSET)
but only 0x6a bytes has been allocated and read from the eeprom.

This lead to out-of-bound accesses and invalid values for
EEPROM_BBPTUNE_R17 and EEPROM_CALIBRATE_OFFSET.

Change the EEPROM_SIZE to 0x6e in order to retrieve all the fields.

Tested with a rt2570 device.

Signed-off-by: Adrien Schildknecht <adrien+dev@schischi.me>
---
 drivers/net/wireless/rt2x00/rt2500usb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h
index afba073..78cc035 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.h
+++ b/drivers/net/wireless/rt2x00/rt2500usb.h
@@ -54,7 +54,7 @@
 #define CSR_REG_BASE			0x0400
 #define CSR_REG_SIZE			0x0100
 #define EEPROM_BASE			0x0000
-#define EEPROM_SIZE			0x006a
+#define EEPROM_SIZE			0x006e
 #define BBP_BASE			0x0000
 #define BBP_SIZE			0x0060
 #define RF_BASE				0x0004
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] rt2x00: adjust EEPROM_SIZE for rt2500usb
  2015-08-10 22:25 [PATCH] rt2x00: adjust EEPROM_SIZE for rt2500usb Adrien Schildknecht
@ 2015-08-12  9:00 ` Stanislaw Gruszka
  2015-08-18  6:05 ` Kalle Valo
  1 sibling, 0 replies; 3+ messages in thread
From: Stanislaw Gruszka @ 2015-08-12  9:00 UTC (permalink / raw)
  To: Adrien Schildknecht
  Cc: helmut.schaa, kvalo, linux-wireless, netdev, linux-kernel

On Tue, Aug 11, 2015 at 12:25:53AM +0200, Adrien Schildknecht wrote:
> rt2500usb_validate_eeprom() read data up to 0x6e (EEPROM_CALIBRATE_OFFSET)
> but only 0x6a bytes has been allocated and read from the eeprom.
> 
> This lead to out-of-bound accesses and invalid values for
> EEPROM_BBPTUNE_R17 and EEPROM_CALIBRATE_OFFSET.
> 
> Change the EEPROM_SIZE to 0x6e in order to retrieve all the fields.
> 
> Tested with a rt2570 device.
> 
> Signed-off-by: Adrien Schildknecht <adrien+dev@schischi.me>

Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: rt2x00: adjust EEPROM_SIZE for rt2500usb
  2015-08-10 22:25 [PATCH] rt2x00: adjust EEPROM_SIZE for rt2500usb Adrien Schildknecht
  2015-08-12  9:00 ` Stanislaw Gruszka
@ 2015-08-18  6:05 ` Kalle Valo
  1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2015-08-18  6:05 UTC (permalink / raw)
  To: Adrien Schildknecht
  Cc: sgruszka, helmut.schaa, linux-wireless, netdev, linux-kernel,
	Adrien Schildknecht


> rt2500usb_validate_eeprom() read data up to 0x6e (EEPROM_CALIBRATE_OFFSET)
> but only 0x6a bytes has been allocated and read from the eeprom.
> 
> This lead to out-of-bound accesses and invalid values for
> EEPROM_BBPTUNE_R17 and EEPROM_CALIBRATE_OFFSET.
> 
> Change the EEPROM_SIZE to 0x6e in order to retrieve all the fields.
> 
> Tested with a rt2570 device.
> 
> Signed-off-by: Adrien Schildknecht <adrien+dev@schischi.me>
> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-08-18  6:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-10 22:25 [PATCH] rt2x00: adjust EEPROM_SIZE for rt2500usb Adrien Schildknecht
2015-08-12  9:00 ` Stanislaw Gruszka
2015-08-18  6:05 ` Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).