| Message ID | 1439245553-2840-1-git-send-email-adrien+dev@schischi.me |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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(-)