32162a4dab
Key locking simplification removed key->sdata != NULL verification from ieee80211_key_free(). While that is fine for most use cases, there is one path where this function can be called with an unlinked key (i.e., key->sdata == NULL && key->local == NULL). This results in a NULL pointer dereference with the current implementation. This is known to happen at least with FT protocol when wpa_supplicant tries to configure the key before association. Avoid the issue by passing in the local pointer to ieee80211_key_free(). In addition, do not clear the key from hw_accel or debugfs if it has not yet been added. At least the hw_accel one could trigger another NULL pointer dereference. Signed-off-by: Jouni Malinen <j@w1.fi> Reviewed-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
148 lines
3.7 KiB
C
148 lines
3.7 KiB
C
/*
|
|
* Copyright 2002-2004, Instant802 Networks, Inc.
|
|
* Copyright 2005, Devicescape Software, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef IEEE80211_KEY_H
|
|
#define IEEE80211_KEY_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/list.h>
|
|
#include <linux/crypto.h>
|
|
#include <linux/rcupdate.h>
|
|
#include <net/mac80211.h>
|
|
|
|
#define WEP_IV_LEN 4
|
|
#define WEP_ICV_LEN 4
|
|
#define ALG_TKIP_KEY_LEN 32
|
|
#define ALG_CCMP_KEY_LEN 16
|
|
#define CCMP_HDR_LEN 8
|
|
#define CCMP_MIC_LEN 8
|
|
#define CCMP_TK_LEN 16
|
|
#define CCMP_PN_LEN 6
|
|
#define TKIP_IV_LEN 8
|
|
#define TKIP_ICV_LEN 4
|
|
|
|
#define NUM_RX_DATA_QUEUES 17
|
|
|
|
struct ieee80211_local;
|
|
struct ieee80211_sub_if_data;
|
|
struct sta_info;
|
|
|
|
/**
|
|
* enum ieee80211_internal_key_flags - internal key flags
|
|
*
|
|
* @KEY_FLAG_UPLOADED_TO_HARDWARE: Indicates that this key is present
|
|
* in the hardware for TX crypto hardware acceleration.
|
|
*/
|
|
enum ieee80211_internal_key_flags {
|
|
KEY_FLAG_UPLOADED_TO_HARDWARE = BIT(0),
|
|
};
|
|
|
|
enum ieee80211_internal_tkip_state {
|
|
TKIP_STATE_NOT_INIT,
|
|
TKIP_STATE_PHASE1_DONE,
|
|
TKIP_STATE_PHASE1_HW_UPLOADED,
|
|
};
|
|
|
|
struct tkip_ctx {
|
|
u32 iv32;
|
|
u16 iv16;
|
|
u16 p1k[5];
|
|
enum ieee80211_internal_tkip_state state;
|
|
};
|
|
|
|
struct ieee80211_key {
|
|
struct ieee80211_local *local;
|
|
struct ieee80211_sub_if_data *sdata;
|
|
struct sta_info *sta;
|
|
|
|
/* for sdata list */
|
|
struct list_head list;
|
|
|
|
/* protected by key mutex */
|
|
unsigned int flags;
|
|
|
|
union {
|
|
struct {
|
|
/* last used TSC */
|
|
struct tkip_ctx tx;
|
|
|
|
/* last received RSC */
|
|
struct tkip_ctx rx[NUM_RX_DATA_QUEUES];
|
|
} tkip;
|
|
struct {
|
|
u8 tx_pn[6];
|
|
/*
|
|
* Last received packet number. The first
|
|
* NUM_RX_DATA_QUEUES counters are used with Data
|
|
* frames and the last counter is used with Robust
|
|
* Management frames.
|
|
*/
|
|
u8 rx_pn[NUM_RX_DATA_QUEUES + 1][6];
|
|
struct crypto_cipher *tfm;
|
|
u32 replays; /* dot11RSNAStatsCCMPReplays */
|
|
/* scratch buffers for virt_to_page() (crypto API) */
|
|
#ifndef AES_BLOCK_LEN
|
|
#define AES_BLOCK_LEN 16
|
|
#endif
|
|
u8 tx_crypto_buf[6 * AES_BLOCK_LEN];
|
|
u8 rx_crypto_buf[6 * AES_BLOCK_LEN];
|
|
} ccmp;
|
|
struct {
|
|
u8 tx_pn[6];
|
|
u8 rx_pn[6];
|
|
struct crypto_cipher *tfm;
|
|
u32 replays; /* dot11RSNAStatsCMACReplays */
|
|
u32 icverrors; /* dot11RSNAStatsCMACICVErrors */
|
|
/* scratch buffers for virt_to_page() (crypto API) */
|
|
u8 tx_crypto_buf[2 * AES_BLOCK_LEN];
|
|
u8 rx_crypto_buf[2 * AES_BLOCK_LEN];
|
|
} aes_cmac;
|
|
} u;
|
|
|
|
/* number of times this key has been used */
|
|
int tx_rx_count;
|
|
|
|
#ifdef CONFIG_MAC80211_DEBUGFS
|
|
struct {
|
|
struct dentry *stalink;
|
|
struct dentry *dir;
|
|
int cnt;
|
|
} debugfs;
|
|
#endif
|
|
|
|
/*
|
|
* key config, must be last because it contains key
|
|
* material as variable length member
|
|
*/
|
|
struct ieee80211_key_conf conf;
|
|
};
|
|
|
|
struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg,
|
|
int idx,
|
|
size_t key_len,
|
|
const u8 *key_data,
|
|
size_t seq_len, const u8 *seq);
|
|
/*
|
|
* Insert a key into data structures (sdata, sta if necessary)
|
|
* to make it used, free old key.
|
|
*/
|
|
void ieee80211_key_link(struct ieee80211_key *key,
|
|
struct ieee80211_sub_if_data *sdata,
|
|
struct sta_info *sta);
|
|
void ieee80211_key_free(struct ieee80211_local *local,
|
|
struct ieee80211_key *key);
|
|
void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx);
|
|
void ieee80211_set_default_mgmt_key(struct ieee80211_sub_if_data *sdata,
|
|
int idx);
|
|
void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata);
|
|
void ieee80211_enable_keys(struct ieee80211_sub_if_data *sdata);
|
|
void ieee80211_disable_keys(struct ieee80211_sub_if_data *sdata);
|
|
|
|
#endif /* IEEE80211_KEY_H */
|