Commit 74b70a4e authored Aug 24, 2010 by Johannes Berg Committed by John W. Linville Aug 25, 2010

nl80211: fix missing nesting



commit 95a6ccbb46c70cff376684c752831c014c87029d
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Thu Aug 12 15:38:38 2010 +0200

    cfg80211/mac80211: extensible frame processing

introduced a netlink bug that caused parsing errors
in userspace because it forgot to close a nesting,
which would advertise a nesting length of zero to
userspace, which then completely threw off parsing
and led to

	Illegal nla->nla_type == 0

being printed by libnl.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent f8d8b7a1

net/wireless/nl80211.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -636,6 +636,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
	nla_nest_end(msg, nl_ftypes);		nla_nest_end(msg, nl_ftypes);
	}		}

			nla_nest_end(msg, nl_ifs);

	nl_ifs = nla_nest_start(msg, NL80211_ATTR_RX_FRAME_TYPES);		nl_ifs = nla_nest_start(msg, NL80211_ATTR_RX_FRAME_TYPES);
	if (!nl_ifs)		if (!nl_ifs)
	goto nla_put_failure;		goto nla_put_failure;