From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 12EA8342515 for ; Fri, 31 Jul 2026 04:02:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785470571; cv=none; b=RKlntsBPmowzy2wdma256x27D0a98X9cWm1dxRYrLQQH2ls1eq6yG+1UEJXq25Z8rNbjmCCu6R4xHVvfMFsoZZajuzGKOrH4YAARM1Lb6UkBpcuLF/q+UZvju2cQ7BB2LhtuliCTVSsFNT4qCGnfNYJi01PxRuf+KISIcBZOlY8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785470571; c=relaxed/simple; bh=6npZXLzNQr37pTaiGSaPJ5r4nLsZGtGLxTdImvdkLFE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=c7qYUh6wavclBP5e9LtsFk/txa7j03FDLwMFXxMvuNI+JEIetTfbTGp6n7koQt5ncP8Zyqy5SnD42+EUjLsA0J1nkFceHs9mxapfrKXYekwZlonXVxqgjlYn63/fNTGPF7hYONl++g6X7VZYL503vdWXhjks0aSAlLxwTrd9k/s= 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=DWVYqgB7; arc=none smtp.client-ip=209.85.216.54 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="DWVYqgB7" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-38ea87caafeso466678a91.3 for ; Thu, 30 Jul 2026 21:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785470568; x=1786075368; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=PYkQ0n9kKm10UHa2kbwd97pMEj1kJJgLqDvtDkUzJFw=; b=DWVYqgB7IqXh8vf+0kBIuzCGMs5hk9sKYY3/Qpi9FkSshAC2V1pAtYW//oA3cW2kp5 X3ijfKuNxZUchq9N231iU9qcCydzoiWNYGJKHlED7Rg8IXFqj1wzu4/l6xG8byFqm0Sx wqMSMR/hJEMgdBOzRYIqf9kg0qMJ1eeacG5AYX3Oghk/ThoybFbbJkr5NXyDrzzRqd0C ql/2zn8HXsXS8KxqBfE4UlvWv+RDGdrVD5bHswKtPN6EFQufJtfwGXbcxfYWLE3mey9+ UKv/oT5j+5tN73sqFckRAuOuC2L8i+aafRCsqzg6riZlfItmK0SsJfppUj8c4tVl0qdZ rJEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785470568; x=1786075368; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=PYkQ0n9kKm10UHa2kbwd97pMEj1kJJgLqDvtDkUzJFw=; b=OFvfpb6+CpYDXCCrFl7brXkl0r4TEJjuk8o85itFXLpCYoUZe+1iAwO+sCQkjxARbF R+2E/EkIqTZd3kYdnQS8WqHKkwYw6B1KsaeaRiMhaO5+0884l1j6/8zwMCnPM6R5Y9Fa Fj0KURMU57ytB4wokFiMB4E2vjW+XH4fnytUAiRBAxk098zifp5viIBT166ty/R1bBG9 8mBI7oAVqGSSFg1/W+7bJFqTwMDnqjVjec5T4bp0u2lfMInjhepzUp5wclGGP5Sqn4+N aPqiLXjXh62p72GtH+SqlngwRdjp2JJJ5tgz2Y2MmZNkgihCg5y7xNhpL3m88yovZdXB ddtQ== X-Forwarded-Encrypted: i=1; AHgh+Rp/KUV5OzFlZvpqZPOUmtOBwzwY6ltXS1HcU+ZsreFj4B5smwXF4iAUfcchBrRr1JB4EGnXdiGjgod2J50=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0VabDqwP83mV7YlU+SJ6IJ91XdYK/LqJSQEVvYilo1k0VBK74 e+K5bjYjalktJyHq0Q/vbPp6+0hnGcmhjJhPmZIaQVAEC0I/wFsbKTig X-Gm-Gg: AR+sD105gPHb3AA4MIl6qBChyI2ZtlWa3LdLVlt3UFO+mN/Z+wh9GgWsnPFAV5f+jmf hEtBQDsA6JX+QyoRNxQj+tlIhfg4M/uYl1UNjZ0siMLqTB7UqtA5MCWqVzZsn8a/EVobx/4l9fu CEgJlfaSHLQgvo/VTkjzPaBLLThUQJus0sIJNjsvhXq3nuMr+t6/y9J3uKKFGac7bknssiwgeFp eXf7O230KpJp2kvXLRGG5dObHo5QER8a/us509JcSg6bqroMV09i8WA2mvMRtqVBEOZkJKLWzRo 5GYdovaG1bEI/4LaFmypgLC2yrGXT+OyzGyNhn4TLAl3EI54jn/bipB46fXntrQOF7MA3hZ2wJu bQ+EIbqVFYnxXxBbWFY3lgwmpNHL36w518iq4ri2PWhLs1jwxIEWLtHWpk/eVWpL3yqkc0NOKT4 xO3+jMcHZdM9ozATk6aLuxpSDjJZ7exhMdo/wf4n6eyaQECg== X-Received: by 2002:a17:90b:4c0e:b0:38e:4e62:f998 with SMTP id 98e67ed59e1d1-38fb140c630mr478058a91.23.1785470567450; Thu, 30 Jul 2026 21:02:47 -0700 (PDT) Received: from [127.0.0.1] ([2407:cdc0:d002::264]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3153e044912sm355977eec.15.2026.07.30.21.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 21:02:47 -0700 (PDT) From: Zhao Li To: Johannes Berg Cc: John Crispin , Aloka Dixit , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] wifi: nl80211: clean up color-change beacon data on errors Date: Fri, 31 Jul 2026 12:02:44 +0800 Message-ID: <20260731120244.82628-1-enderaoelyther@gmail.com> In-Reply-To: <450be3831c5e0234c309d4c04641a42c6ac4f2b0.camel@sipsolutions.net> References: <450be3831c5e0234c309d4c04641a42c6ac4f2b0.camel@sipsolutions.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nl80211_color_change() calls nl80211_parse_beacon() for the beacon_next template, which can allocate params.beacon_next.mbssid_ies and .rnr_ies. A parsing failure returned directly instead of using the out: cleanup, leaking any allocations completed before the error. Allocate the nested attribute table before parsing beacon_next. Its allocation failure can then return before beacon data exists, while a later parsing failure uses out: to release the parsed data. Fixes: dc1e3cb8da8b ("nl80211: MBSSID and EMA support in AP mode") Assisted-by: Codex:gpt-5 Assisted-by: Claude:opus-4.8 Assisted-by: Kimi:K3 Signed-off-by: Zhao Li --- Changes in v2: - Allocate the attribute table before parsing beacon_next, as suggested by Johannes. net/wireless/nl80211.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 5adcb6bd0fc5..755f8fe711fb 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -18750,15 +18750,15 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info) if (!wdev->links[params.link_id].ap.beacon_interval) return -EINVAL; + tb = kzalloc_objs(*tb, NL80211_ATTR_MAX + 1); + if (!tb) + return -ENOMEM; + err = nl80211_parse_beacon(rdev, info->attrs, ¶ms.beacon_next, wdev->links[params.link_id].ap.chandef.chan, info->extack); if (err) - return err; - - tb = kzalloc_objs(*tb, NL80211_ATTR_MAX + 1); - if (!tb) - return -ENOMEM; + goto out; err = nla_parse_nested(tb, NL80211_ATTR_MAX, info->attrs[NL80211_ATTR_COLOR_CHANGE_ELEMS], base-commit: 57aa1718d5953dd532137d43b696c68545c2e0b3 -- 2.50.1 (Apple Git-155)