From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AE3621E098; Sat, 30 May 2026 17:59:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780163941; cv=none; b=J+X1RHDkW8jlvzN46xoMj1wpdUv+bRrFsME/fObU7Rd8o2NtsZ9lV146u6pix0Zf8Tt5S4rwb77h/vhUkHeT5y1vzrMUFV5yo9+ZgL10mcYEiN58NTEJuhf02O/TPqV0m18wN1ytZp7BskTUu6gt/j/ATJSsFWJC8YBCHDqwd8M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780163941; c=relaxed/simple; bh=tAHB5kOrtk2gy67EDH18TU9pBysJM3BTBT8hvc2ii6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lMWwFO/Ql5/Kw/Cb5+usdJLSKO1XfMhXa+VGKE/XYd8mhVhaAF6JQqer2P5G8aHDNJ0rTI2hCqmNXq/O4LAyUyYBf3YQ+NE5qoQ7hcQwr5nUYb15GPKobrWcXCKHA+Qk0z5P3f+T96P0zx99fv4JrkuE/lGWdCK9f8CgL/PuAoQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TjFyLrZN; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TjFyLrZN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D650B1F00899; Sat, 30 May 2026 17:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780163940; bh=t7TDn62qHQ1XHWaJuhjVJKd6hysWKGCVPvEhuKO+Il0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TjFyLrZNWTsErtg06HSAvkQZ3q/845MvlBajW3nTHSkrTq5krkwnl2sjq7JW+DSMG 15WZEZUrWY/Zd4iPcEMy61W39EZ3lN+ebol1bY/q9w2GFLPkO7M1ZGxikkvcIEHgyg VyupdZedJ//8JDoPZvL40e/L+UAqp7mxL9YDySGw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xiang Mei , Weiming Shi , Sun Jian , Paul Chaignon , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.15 408/776] bpf: fix end-of-list detection in cgroup_storage_get_next_key() Date: Sat, 30 May 2026 18:02:02 +0200 Message-ID: <20260530160251.037945050@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160240.228940103@linuxfoundation.org> References: <20260530160240.228940103@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Weiming Shi [ Upstream commit 5828b9e5b272ecff7cf5d345128d3de7324117f7 ] list_next_entry() never returns NULL -- when the current element is the last entry it wraps to the list head via container_of(). The subsequent NULL check is therefore dead code and get_next_key() never returns -ENOENT for the last element, instead reading storage->key from a bogus pointer that aliases internal map fields and copying the result to userspace. Replace it with list_entry_is_head() so the function correctly returns -ENOENT when there are no more entries. Fixes: de9cbbaadba5 ("bpf: introduce cgroup storage maps") Reported-by: Xiang Mei Signed-off-by: Weiming Shi Reviewed-by: Sun Jian Acked-by: Paul Chaignon Link: https://lore.kernel.org/r/20260403132951.43533-2-bestswngs@gmail.com Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- kernel/bpf/local_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/local_storage.c b/kernel/bpf/local_storage.c index 035e9e3a7132e..85e1b5fba0d57 100644 --- a/kernel/bpf/local_storage.c +++ b/kernel/bpf/local_storage.c @@ -259,7 +259,7 @@ static int cgroup_storage_get_next_key(struct bpf_map *_map, void *key, goto enoent; storage = list_next_entry(storage, list_map); - if (!storage) + if (list_entry_is_head(storage, &map->list, list_map)) goto enoent; } else { storage = list_first_entry(&map->list, -- 2.53.0