6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Berg [ Upstream commit 55308cee9c2196f39cd1ce8ee6c1fed9e12a00d4 ] When trying to do a color change, validate that the link is beaconing first, to avoid calling the driver with an invalid link. Reviewed-by: Miriam Rachel Korenblit Link: https://patch.msgid.link/20260415145348.beb59ea5fbf7.I128a956a3e610bb6a5c9cad941d7d5b59b735a5e@changeid Signed-off-by: Johannes Berg Stable-dep-of: 927ee844c47a ("wifi: nl80211: clean up color-change beacon data on errors") Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index c4af4cc443676..ac1cba2ce48a0 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -16090,6 +16090,7 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info) struct net_device *dev = info->user_ptr[1]; struct wireless_dev *wdev = dev->ieee80211_ptr; struct nlattr **tb; + unsigned int link_id; u16 offset; int err; @@ -16111,6 +16112,10 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info) params.count = nla_get_u8(info->attrs[NL80211_ATTR_COLOR_CHANGE_COUNT]); params.color = nla_get_u8(info->attrs[NL80211_ATTR_COLOR_CHANGE_COLOR]); + link_id = nl80211_link_id(info->attrs); + if (!wdev->links[link_id].ap.beacon_interval) + return -EINVAL; + err = nl80211_parse_beacon(rdev, info->attrs, ¶ms.beacon_next, info->extack); if (err) -- 2.53.0