Return-path: Received: from mx1.redhat.com ([209.132.183.28]:12192 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964795Ab0BZOM3 (ORCPT ); Fri, 26 Feb 2010 09:12:29 -0500 Date: Fri, 26 Feb 2010 15:10:28 +0100 From: Stanislaw Gruszka To: "John W. Linville" Cc: linux-wireless@vger.kernel.org, Dan Williams Subject: [PATCH resend] airo: return from set_wep_key() when key length is zero Message-ID: <20100226141027.GA10280@dhcp-lab-161.englab.brq.redhat.com> References: <1265121290-2969-1-git-send-email-sgruszka@redhat.com> <20100204120713.GB6068@dhcp-lab-161.englab.brq.redhat.com> <20100208205358.GA3852@tuxdriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20100208205358.GA3852@tuxdriver.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Even if keylen == 0 is a bug and should not really happen, better avoid possibility of passing bad value to firmware. Signed-off-by: Stanislaw Gruszka --- drivers/net/wireless/airo.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 2a9f029..01bffc2 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -5254,7 +5254,8 @@ static int set_wep_key(struct airo_info *ai, u16 index, const char *key, WepKeyRid wkr; int rc; - WARN_ON(keylen == 0); + if (WARN_ON(keylen == 0)) + return -1; memset(&wkr, 0, sizeof(wkr)); wkr.len = cpu_to_le16(sizeof(wkr)); -- 1.6.2.5