| Message ID | 1470136768-28077-1-git-send-email-ryazanov.s.a@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | af8a9a67c3466f70ab28a112d18eb5d327d40ca2 |
| Delegated to: | Kalle Valo |
| Headers | show |
Sergey Ryazanov <ryazanov.s.a@gmail.com> wrote: > EEPROM size calculated in 16-bit words, so we should take into account > this fact during buffer allocation. > > CC: Jiri Slaby <jirislaby@gmail.com> > CC: Nick Kossifidis <mickflemm@gmail.com> > CC: Luis R. Rodriguez <mcgrof@do-not-panic.com> > Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> Thanks, 1 patch applied to wireless-drivers-next.git: af8a9a67c346 ath5k: fix EEPROM dumping via debugfs
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c index 929d7cc..4f8d9ed 100644 --- a/drivers/net/wireless/ath/ath5k/debug.c +++ b/drivers/net/wireless/ath/ath5k/debug.c @@ -909,7 +909,7 @@ static int open_file_eeprom(struct inode *inode, struct file *file) struct ath5k_hw *ah = inode->i_private; bool res; int i, ret; - u32 eesize; + u32 eesize; /* NB: in 16-bit words */ u16 val, *buf; /* Get eeprom size */ @@ -932,7 +932,7 @@ static int open_file_eeprom(struct inode *inode, struct file *file) /* Create buffer and read in eeprom */ - buf = vmalloc(eesize); + buf = vmalloc(eesize * 2); if (!buf) { ret = -ENOMEM; goto err; @@ -952,7 +952,7 @@ static int open_file_eeprom(struct inode *inode, struct file *file) } ep->buf = buf; - ep->len = i; + ep->len = eesize * 2; file->private_data = (void *)ep;
EEPROM size calculated in 16-bit words, so we should take into account this fact during buffer allocation. CC: Jiri Slaby <jirislaby@gmail.com> CC: Nick Kossifidis <mickflemm@gmail.com> CC: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> --- drivers/net/wireless/ath/ath5k/debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)