public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cfg80211: don't put kek/kck/replay counter on the stack

Browse source 
There's no need to put the values on the stack, just pass a
pointer to the data in the nl80211 message. This reduces stack
usage and avoids potential issues with putting sensitive data
on the stack.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2014-09-10 22:28:06 +03:00
parent 538c9eb8b3
commit 78f686cae0
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/net/cfg80211.h
View file

@ -1980,14 +1980,12 @@ struct cfg80211_wowlan_wakeup {
/** /**
* struct cfg80211_gtk_rekey_data - rekey data * struct cfg80211_gtk_rekey_data - rekey data
* @kek: key encryption key * @kek: key encryption key (NL80211_KEK_LEN bytes)
* @kck: key confirmation key * @kck: key confirmation key (NL80211_KCK_LEN bytes)
* @replay_ctr: replay counter * @replay_ctr: replay counter (NL80211_REPLAY_CTR_LEN bytes)
*/ */
struct cfg80211_gtk_rekey_data { struct cfg80211_gtk_rekey_data {
u8 kek[NL80211_KEK_LEN]; const u8 *kek, *kck, *replay_ctr;
u8 kck[NL80211_KCK_LEN];
u8 replay_ctr[NL80211_REPLAY_CTR_LEN];
}; };
/** /**

10
net/wireless/nl80211.c
View file

@ -8959,13 +8959,9 @@ static int nl80211_set_rekey_data(struct sk_buff *skb, struct genl_info *info)
if (nla_len(tb[NL80211_REKEY_DATA_KCK]) != NL80211_KCK_LEN) if (nla_len(tb[NL80211_REKEY_DATA_KCK]) != NL80211_KCK_LEN)
return -ERANGE; return -ERANGE;
memcpy(rekey_data.kek, nla_data(tb[NL80211_REKEY_DATA_KEK]), rekey_data.kek = nla_data(tb[NL80211_REKEY_DATA_KEK]);
NL80211_KEK_LEN); rekey_data.kck = nla_data(tb[NL80211_REKEY_DATA_KCK]);
memcpy(rekey_data.kck, nla_data(tb[NL80211_REKEY_DATA_KCK]), rekey_data.replay_ctr = nla_data(tb[NL80211_REKEY_DATA_REPLAY_CTR]);
NL80211_KCK_LEN);
memcpy(rekey_data.replay_ctr,
nla_data(tb[NL80211_REKEY_DATA_REPLAY_CTR]),
NL80211_REPLAY_CTR_LEN);
wdev_lock(wdev); wdev_lock(wdev);
if (!wdev->current_bss) { if (!wdev->current_bss) {