Messages in this thread Patch in this message | | | Date | Fri, 04 Sep 2009 17:14:38 -0700 | From | Greg KH <> | Subject | [patch 63/71] ar9170: fix read & write outside array bounds |
| |
2.6.30-stable review patch. If anyone has any objections, please let us know.
------------------ From: Dan Carpenter <error27@gmail.com>
commit e9d126cdfa60b575f1b5b02024c4faee27dccf07 upstream.
Backport done by Christian Lamparter <chunkeey@googlemail.com>
queue == __AR9170_NUM_TXQ would cause a bug on the next line.
found by Smatch ( http://repo.or.cz/w/smatch.git ).
Reported-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Christian Lamparter <chunkeey@web.de> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/net/wireless/ar9170/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/net/wireless/ar9170/main.c +++ b/drivers/net/wireless/ar9170/main.c @@ -1486,13 +1486,14 @@ static int ar9170_conf_tx(struct ieee802 int ret; mutex_lock(&ar->mutex); - if ((param) && !(queue > ar->hw->queues)) { + if (queue < __AR9170_NUM_TXQ) { memcpy(&ar->edcf[ar9170_qos_hwmap[queue]], param, sizeof(*param)); ret = ar9170_set_qos(ar); - } else + } else { ret = -EINVAL; + } mutex_unlock(&ar->mutex); return ret;
| |