From patchwork Tue Aug 11 18:36:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John W. Linville" X-Patchwork-Id: 40724 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7BIl7UK005395 for ; Tue, 11 Aug 2009 18:47:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754369AbZHKSqM (ORCPT ); Tue, 11 Aug 2009 14:46:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753387AbZHKSqL (ORCPT ); Tue, 11 Aug 2009 14:46:11 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:59027 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753144AbZHKSqK (ORCPT ); Tue, 11 Aug 2009 14:46:10 -0400 Received: from uucp by smtp.tuxdriver.com with local-rmail (Exim 4.63) (envelope-from ) id 1MawMM-0008Lv-VT; Tue, 11 Aug 2009 14:46:11 -0400 Received: from linville-t400.local (linville-t400.local [127.0.0.1]) by linville-t400.local (8.14.3/8.14.3) with ESMTP id n7BIa64s004886; Tue, 11 Aug 2009 14:36:06 -0400 Received: (from linville@localhost) by linville-t400.local (8.14.3/8.14.3/Submit) id n7BIa6W1004884; Tue, 11 Aug 2009 14:36:06 -0400 Date: Tue, 11 Aug 2009 14:36:06 -0400 From: "John W. Linville" To: davem@davemloft.net Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: pull request: wireless-2.6 2009-08-11 Message-ID: <20090811183605.GG2634@tuxdriver.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Dave, Here are a couple more minor fixes intended for 2.6.31. Hopefully we are winding-down! Please let me know if there are problems! John --- Individual patches are available here: http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ --- The following changes since commit 973507cb8610d4c84f090d5f1f0ca54fa0559d27: roel kluin (1): mlx4_en: Fix read buffer overflow in mlx4_en_complete_rx_desc() are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master Christian Lamparter (1): ar9170usb: fix spurious firmware related message Dan Carpenter (1): ar9170: fix read & write outside array bounds drivers/net/wireless/ath/ar9170/main.c | 5 +++-- drivers/net/wireless/ath/ar9170/usb.c | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c index 9d38cf6..88c3d85 100644 --- a/drivers/net/wireless/ath/ar9170/main.c +++ b/drivers/net/wireless/ath/ar9170/main.c @@ -1967,13 +1967,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; diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c index 754b1f8..007eb85 100644 --- a/drivers/net/wireless/ath/ar9170/usb.c +++ b/drivers/net/wireless/ath/ar9170/usb.c @@ -598,11 +598,15 @@ static int ar9170_usb_request_firmware(struct ar9170_usb *aru) err = request_firmware(&aru->init_values, "ar9170-1.fw", &aru->udev->dev); + if (err) { + dev_err(&aru->udev->dev, "file with init values not found.\n"); + return err; + } err = request_firmware(&aru->firmware, "ar9170-2.fw", &aru->udev->dev); if (err) { release_firmware(aru->init_values); - dev_err(&aru->udev->dev, "file with init values not found.\n"); + dev_err(&aru->udev->dev, "firmware file not found.\n"); return err; }