mac80211: avoid excessive stack usage in sta_info
authorArnd Bergmann <arnd@arndb.de>
Tue, 26 Jan 2016 22:05:31 +0000 (23:05 +0100)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 11 Jul 2016 03:07:08 +0000 (23:07 -0400)
commit6c59578f592a6873a71bc1397ccf60615d2abec0
tree44c537d064cadd2ac9f72482acbbf9ad57148575
parentf46752f2993159836cb0591f5b6083f9ff2d7039
mac80211: avoid excessive stack usage in sta_info

[ Upstream commit 0ef049dc1167fe834d0ad5d63f89eddc5c70f6e4 ]

When CONFIG_OPTIMIZE_INLINING is set, the sta_info_insert_finish
function consumes more stack than normally, exceeding the
1024 byte limit on ARM:

net/mac80211/sta_info.c: In function 'sta_info_insert_finish':
net/mac80211/sta_info.c:561:1: error: the frame size of 1080 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]

It turns out that there are two functions that put a 'struct station_info'
on the stack: __sta_info_destroy_part2 and sta_info_insert_finish, and
this structure alone requires up to 792 bytes.

Hoping that both are called rarely enough, this replaces the
on-stack structure with a dynamic allocation, which unfortunately
requires some suboptimal error handling for out-of-memory.

The __sta_info_destroy_part2 function is actually affected by the
stack usage twice because it calls cfg80211_del_sta_sinfo(), which
has another instance of struct station_info on its stack.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 98b6218388e3 ("mac80211/cfg80211: add station events")
Fixes: 6f7a8d26e266 ("mac80211: send statistics with delete station event")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
net/mac80211/sta_info.c