From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA3993955EB for ; Wed, 10 Jun 2026 11:22:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781090539; cv=none; b=JAo/p60e0BX0pMk867afyUkHL8Ru22pseP4av22ksoRFG8PMqFf5PFP+Bx0ebz7Il/IbYuzeaPihbPuQvdh8VQ3QI0xuDGdGzNDIHVZJ2PBwnJIyQgaHizKjg/pyfllpryw7x/0g++e27EV7i1Lp+N3VVSCvP21EZwbqWRk0reg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781090539; c=relaxed/simple; bh=81fi74Es7hbpBwXb46QB/gNhccsSO4KpUAi5dNGAa60=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tHiDnbMsdQA17N6p9aGvrjGJ+ov7e3ANjR4j6gGE1iMfCBPalq4PHzW7bkN6SMdfCbKVhkfCPZkkadiC8g/GZNyG5I9SxJqWwlMOnMwP1v43pXN8beZKppVellVI+e2+PP6Chuvd6powzdQhpE4E2cf2OytCjo06+Bvw04JoBPI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eZtJ7UV5; arc=none smtp.client-ip=209.85.215.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eZtJ7UV5" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-c859878eb48so2632202a12.0 for ; Wed, 10 Jun 2026 04:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781090538; x=1781695338; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=opZ6v4Kl/mF5kQfriluZVsUk4+PmzqHRLQXTUfRfqXw=; b=eZtJ7UV5z49yBBxMZ8N4qszQSTtpcI2B5w+N+BXQzI67dtDo7IWOIM7kssYApCZJLd wst1CrfK1FNZ3NRlfIeF0MMxLosivHh+p1k8i/Ky8ikYICpkHGHw/Y3Zj/tBgC3+PCXc /11jZv3OG1wAhsUJXOLqwJ2jNwJ04bsoxXD3IUa1vzf7qRkgGCx2AvJEDhJr6HyONqvv hIXfs/WqTZuOLSFAnd6DoWz/LzTePq/iksEp80w+gOaAS02ZfwJG/bzFEOA39XEO/G8O 8MN2zNccr9VqqT1qUPokIf8saT+2ig44hwNisHwW+W2YKuxiKUFfCg73ZIvrLWBuvP4R NHuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781090538; x=1781695338; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=opZ6v4Kl/mF5kQfriluZVsUk4+PmzqHRLQXTUfRfqXw=; b=AS94u/jjB32CAkTFy0nhlXyd7zhGqzJwyBfcIjFbGn4qtv+/wr280xTgbp+0PKy5v4 4ZTfogIUzDKZpwHUSDkNW3wEtKxs+pMjxf8Yha8t6oKifdfhOVm2XFgNHsUypnSswMiU WmyIsHikUBmsnLIOzColnsE6Nqb+v7scekMsuBTeiU6xDEOrKrzBJmlZnv9lVJdR0wdT CwYCUF+bWMmCuIJ97t4tSekE7KI+3k6HBEKTkDRyKq0pHaHGx45gsJaD26B2Gc6gs5k3 5w72gRBaaJbuWDXCVUem6eo7HOcQXL47k0htQlDOXMyv/YoRd8wXOHp33/UhCHFb3DTo Hi2g== X-Forwarded-Encrypted: i=1; AFNElJ/rfrTr3bTWshmxQNuOIcuAlBYxhpcbj9tUdkBiEgn71/ZVkiG8KM2Q5VMX5S6w/V5G+m8qZEo5TAfDJ+0=@vger.kernel.org X-Gm-Message-State: AOJu0YyATZlwnSbhcFbw+bcqg2gNu4CGmB0YcVOH/5NbLNdDDoUv6fS8 YUOAscK4W+HmUpWX8FqVFA68gcNxfAQ11eNWH9SNDHgesdyUnI2t/YrQ X-Gm-Gg: Acq92OEqTAukOWfiCInOMHBX85d9epKqWOguVWCg9o/1IyrBKE0amW29yI67kEG7gtg KFIk7F4MyjFSVsj+xgfBDKvxOizozvA0tqKNpcehyL8MqmwS7HVcvduCOYfCBk1FnMbiqWwUBXh SlqKBqQPhscQfHftH2Bsl2edvzcYyAEQceP30KbRjw3mOrW5QNTLkU89j0JCo+J4JLp5VBYN3+X kodJkEp6bW/WjuM+IOJbXU5QLNjWnaCdd2LrOHL6ZaApYqLgemBLun/he0nLJbi1d+hr9jfFTBF DivUQrh1l+B7aKibqNJzCzlydB117hvEBYd0vzG3uSdbhkuOqWFT0Auo1xVViPlrHcSBBjzRoGq wPTpTG1RP3FHq7IZl1U+NizJ6k0SysacwpZhNcO6W+4MK6wel3pS6ksD4ojKAKr55iK/K8cZFlN jGVqPNjsOf6iLtpfJBFtOkEHCJiFwAibpje8D0bJFDj1ywI1semoU92HyqpmtrnqyXMogctYzAR A== X-Received: by 2002:a05:6a21:4c16:b0:3a2:f14a:4287 with SMTP id adf61e73a8af0-3b4ccd3a3ffmr31763679637.6.1781090538069; Wed, 10 Jun 2026 04:22:18 -0700 (PDT) Received: from KRHW1CJW23.bytedance.net ([139.177.225.252]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c85df033887sm21390403a12.2.2026.06.10.04.22.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 10 Jun 2026 04:22:17 -0700 (PDT) From: Zhao Li To: Johannes Berg Cc: Aloka Dixit , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] wifi: nl80211: free RNR data on MBSSID mismatch Date: Wed, 10 Jun 2026 19:22:09 +0800 Message-ID: <20260610112208.1308-2-enderaoelyther@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nl80211_parse_beacon() rejects EMA RNR data when there are fewer RNR entries than MBSSID entries. The rejected RNR allocation has not been attached to the beacon data yet, so free it before returning the error. Fixes: dbbb27e183b1 ("cfg80211: support RNR for EMA AP") Signed-off-by: Zhao Li --- net/wireless/nl80211.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 76c537a6e8b52..1b4c4440d2abf 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6519,8 +6519,10 @@ static int nl80211_parse_beacon(struct cfg80211_registered_device *rdev, if (IS_ERR(rnr)) return PTR_ERR(rnr); - if (rnr && rnr->cnt < bcn->mbssid_ies->cnt) + if (rnr && rnr->cnt < bcn->mbssid_ies->cnt) { + kfree(rnr); return -EINVAL; + } bcn->rnr_ies = rnr; } -- 2.50.1 (Apple Git-155)