netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Kimdon <david.kimdon@devicescape.com>
To: netdev@vger.kernel.org
Cc: "John W. Linville" <linville@tuxdriver.com>,
	Jiri Benc <jbenc@suse.cz>,
	David Kimdon <david.kimdon@devicescape.com>
Subject: [patch 7/7] d80211: do not pass an invalid key index to set_key()
Date: Wed, 6 Dec 2006 16:45:40 -0800	[thread overview]
Message-ID: <20061207004540.GG16252@devicescape.com> (raw)
In-Reply-To: 20061207004238.540749000@devicescape.com

[-- Attachment #1: alg-none-keyix.patch --]
[-- Type: text/plain, Size: 784 bytes --]

If a hardware key has not been configured then there is no point
to calling DISABLE_KEY.

Signed-off-by: David Kimdon <david.kimdon@devicescape.com>

Index: wireless-dev/net/d80211/ieee80211_ioctl.c
===================================================================
--- wireless-dev.orig/net/d80211/ieee80211_ioctl.c
+++ wireless-dev/net/d80211/ieee80211_ioctl.c
@@ -612,7 +612,7 @@ static int ieee80211_set_encryption(stru
 
 	if (alg == ALG_NONE) {
 		keyconf = NULL;
-		if (try_hwaccel && key && local->ops->set_key &&
+		if (try_hwaccel && key && key->hw_key_idx != -1 && local->ops->set_key &&
 		    (keyconf = ieee80211_key_data2conf(local, key)) != NULL &&
 		    local->ops->set_key(local_to_hw(local), DISABLE_KEY,
 				       sta_addr, keyconf, sta ? sta->aid : 0)) {

--

  parent reply	other threads:[~2006-12-07  0:45 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20061207004238.540749000@devicescape.com>
2006-12-07  0:44 ` [patch 1/7] d80211: allow for hardware crypto of default keys David Kimdon
2006-12-07  0:45 ` [patch 2/7] d80211: set default_wep_only dynamically David Kimdon
2006-12-07  0:45 ` [patch 3/7] d80211: fix potential interface name overflow David Kimdon
2006-12-07  0:45 ` [patch 4/7] d80211: fix potential invalid array index returning key information David Kimdon
2006-12-07  0:45 ` [patch 5/7] d80211: remove unused references to sub interface data David Kimdon
2006-12-07 12:29   ` Johannes Berg
2006-12-07  0:45 ` [patch 6/7] d80211: fix invalid check for sub interface type AP David Kimdon
2006-12-07 12:47   ` Jiri Benc
2006-12-07  0:45 ` David Kimdon [this message]
2006-12-07 12:25   ` [patch 7/7] d80211: do not pass an invalid key index to set_key() Jiri Benc
2006-12-07 17:01     ` David Kimdon

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=20061207004540.GG16252@devicescape.com \
    --to=david.kimdon@devicescape.com \
    --cc=jbenc@suse.cz \
    --cc=linville@tuxdriver.com \
    --cc=netdev@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).