Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b26dead authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

rt2x00: fix memory corruption in rf cache, add a sanity check 



Change rt2x00_rf_read() and rt2x00_rf_write() to subtract 1 from the rf
register number.  This is needed because the rf registers are enumerated
starting with one.  The size of the rf register cache is just enough to
hold all registers, so writing to the highest register was corrupting
memory.  Add a check to make sure that the rf register number is valid.

Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Cc: stable@kernel.org
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 416fbdff

drivers/net/wireless/rt2x00/rt2x00.h

+4 −2
Original line number Diff line number Diff line
@@ -849,13 +849,15 @@ struct rt2x00_dev { 
static inline void rt2x00_rf_read(struct rt2x00_dev *rt2x00dev,

				  const unsigned int word, u32 *data)

{

	*data = rt2x00dev->rf[word];

	BUG_ON(word < 1 || word > rt2x00dev->ops->rf_size / sizeof(u32));

	*data = rt2x00dev->rf[word - 1];

}



static inline void rt2x00_rf_write(struct rt2x00_dev *rt2x00dev,

				   const unsigned int word, u32 data)

{

	rt2x00dev->rf[word] = data;

	BUG_ON(word < 1 || word > rt2x00dev->ops->rf_size / sizeof(u32));

	rt2x00dev->rf[word - 1] = data;

}



/*