From: "John W. Linville" <linville@tuxdriver.com>
To: Christian Lamparter <chunkeey@web.de>
Cc: wireless <linux-wireless@vger.kernel.org>,
Dan Carpenter <error27@gmail.com>
Subject: Re: [PATCH 2.6.31] ar9170: fix read & write outside array bounds
Date: Mon, 10 Aug 2009 13:57:55 -0400 [thread overview]
Message-ID: <20090810175755.GG2733@tuxdriver.com> (raw)
In-Reply-To: <200908091424.09712.chunkeey@web.de>
On Sun, Aug 09, 2009 at 02:24:09PM +0200, Christian Lamparter wrote:
> From: Dan Carpenter <error27@gmail.com>
>
> queue == __AR9170_NUM_TXQ would cause a bug on the next line.
>
> found by Smatch ( http://repo.or.cz/w/smatch.git ).
>
> Cc: stable@kernel.org
> Reported-by: Dan Carpenter <error27@gmail.com>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> Signed-off-by: Christian Lamparter <chunkeey@web.de>
> ---
> diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
> index 4fc389a..ea8c941 100644
> --- a/drivers/net/wireless/ath/ar9170/main.c
> +++ b/drivers/net/wireless/ath/ar9170/main.c
> @@ -2458,13 +2458,14 @@ static int ar9170_conf_tx(struct ieee80211_hw *hw, u16 queue,
> int ret;
>
> mutex_lock(&ar->mutex);
> - if ((param) && !(queue > __AR9170_NUM_TXQ)) {
> + 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;
The p54 version of this patch used hw->queues instead of a constant.
Wouldn't that be better here?
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2009-08-10 18:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-09 12:24 [PATCH 2.6.31] ar9170: fix read & write outside array bounds Christian Lamparter
2009-08-10 17:57 ` John W. Linville [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-08-10 18:56 Chunkeey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090810175755.GG2733@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=chunkeey@web.de \
--cc=error27@gmail.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).