Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78520cad authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix debugfs default key oops 



Under certain circumstances (in AP mode) the debugfs function
that is supposed to add the default key symlink can encounter
a NULL default_key pointer. This patch makes it handle that
situtation gracefully.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d5251aea

net/mac80211/debugfs_key.c

+12 −3
Original line number Diff line number Diff line
@@ -255,14 +255,23 @@ void ieee80211_debugfs_key_remove(struct ieee80211_key *key) 
void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata)

{

	char buf[50];

	struct ieee80211_key *key;



	if (!sdata->debugfsdir)

		return;



	sprintf(buf, "../keys/%d", sdata->default_key->debugfs.cnt);

	/* this is running under the key lock */



	key = sdata->default_key;

	if (key) {

		sprintf(buf, "../keys/%d", key->debugfs.cnt);

		sdata->debugfs.default_key =

		debugfs_create_symlink("default_key", sdata->debugfsdir, buf);

			debugfs_create_symlink("default_key",

					       sdata->debugfsdir, buf);

	} else

		ieee80211_debugfs_key_remove_default(sdata);

}



void ieee80211_debugfs_key_remove_default(struct ieee80211_sub_if_data *sdata)

{

	if (!sdata)