]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
mac80211: avoid excessive stack usage in sta_info
authorArnd Bergmann <arnd@arndb.de>
Tue, 26 Jan 2016 22:05:31 +0000 (23:05 +0100)
committerTim Gardner <tim.gardner@canonical.com>
Thu, 21 Apr 2016 13:20:34 +0000 (07:20 -0600)
commit6512229246c063fa242c889b39c0f17647e41f5f
tree781eb8e9317ec23c0cfee19ff51e909720b5f4a1
parenta75e50423ca4cac81d9ceda3545524d6eabc9e87
mac80211: avoid excessive stack usage in sta_info

BugLink: http://bugs.launchpad.net/bugs/1573034
commit 0ef049dc1167fe834d0ad5d63f89eddc5c70f6e4 upstream.

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
net/mac80211/sta_info.c