Commit 4fa029fc authored Sep 18, 2017 by Johannes Berg Committed by Greg Kroah-Hartman Sep 19, 2018

nl80211: fix null-ptr dereference on invalid mesh configuration



commit 265698d7e6132a2d41471135534f4f36ad15b09c upstream.

If TX rates are specified during mesh join, the channel must
also be specified. Check the channel pointer to avoid a null
pointer dereference if it isn't.

Reported-by: Jouni Malinen <j@w1.fi>
Fixes: 8564e382 ("cfg80211: add checks for beacon rate, extend to mesh")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 07a6134d

net/wireless/nl80211.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -9481,6 +9481,9 @@ static int nl80211_join_mesh(struct sk_buff skb, struct genl_info info)
		if (err)
		return err;

		if (!setup.chandef.chan)
		return -EINVAL;

		err = validate_beacon_tx_rate(rdev, setup.chandef.chan->band,
		&setup.beacon_rate);
		if (err)