From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795058816; b=nPnCzRGWJyaoshFjkR6gjTs/hZGYE6X8jkrro7E5JyJi4xMdEpjJbvbmZWixmicSDutS BcyG+XGjX8SSHYIhytBKrKoMC4ttX/d1dNzQRZolwsf0MXS5STdhHjQPOGdT1U9u5xs29 gdMiQpqM9Gv2Tlqzko40iVnHSoszmMp9JgWPpg06UNO3slcZPi0H7MUZxpNNCbWYLZ3fj Z2qTEtECeeYY/Pwt++uWsOsDsAKaBMfkQIWY6/YSaW7CgK2fjuFHyRlQFD9tTfnovrIhC WxUaUu7DD8MqIUdaoF6299e6cIkCqnWdNrt3gZ6TKFuKa/N8tB/ATPVUDYTmsuZxjEg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058816; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=osDE9y6KvwjEyierOQe8gZQNvOiNa7xq3JOGvuOXeBk=; b=TQwct7qL5Q8RZAimaVV4ItabujLFd2Ot7+kiG2eKDXNyztQVyFSwIyMsWiGnzKNevnpW xv1zF9HIwsNSWmMipQNFNUqTqZYpT7XNQhA/Ph4lTXOtTneu3a2xomkI/+AJpghD8/d51 0d4jagMHITy6ja5g5VKftsDnJp8JNQPiCgx/XWUKxXl65igWhZSXUfmY0RmT66nhkr7k9 twWhFsPGCdjL8YjCKbHLJxHvyT5cTES35Vv37cYmvvkN8sU/UkOvlgqGbJQbv4J/FqaKW 2MaYgzNozhjXOU4W9lf8vzcF5H4jldbfiWtIYf9OZX+UvonqHRoa1tPXgfv/kYsT0vg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=h3XksvZZ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92593606A334; Thu, 19 Nov 2026 03:26:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=h3XksvZZ Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8F521F000C5; Thu, 19 Nov 2026 03:26:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795058816; bh=osDE9y6KvwjEyierOQe8gZQNvOiNa7xq3JOGvuOXeBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h3XksvZZ6+4ajVBmhb9tnzM9yQL1LkYj2sElONSrQjKfGKBkFwMVqqHwCmXv+6fwS uFGpSf7Cjj7aJc9jPXbQVgR2Txfbfmac4yLpU0X7HK1Y/YYnBU0Kq5eDhuxK1Aq1uo AJYm7ZUc1dOv+1vUKVkE+J92OcUIcb5SPuCfjuvo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Felix Hoffmann , Alex Markuze , Ilya Dryomov , Sasha Levin Subject: [PATCH 5.10 0579/1848] libceph: reject mismatched CRUSH weight-set sizes Date: Wed, 18 Nov 2026 15:43:37 +0100 Message-ID: <20261118145939.421525948@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Hoffmann [ Upstream commit d8fc89b5bfe4cb3aebe4c8a818247d11291b841c ] A CEPH_MSG_OSD_MAP message can contain CRUSH choose args with replacement weight vectors for straw2 buckets. decode_choose_args() validates the optional IDs vector against the referenced bucket, but does not validate the size of any replacement-weight vector. The CRUSH mapper assumes that each replacement vector has exactly as many entries as the bucket. A zero-length vector for a nonempty bucket makes bucket_straw2_choose() dereference NULL, while a shorter nonzero vector causes an out-of-bounds read. An authenticated monitor or OSD can deliver such a map and crash a kernel client when it performs placement for an ordinary request. Reject a nonempty collection of weight sets for an absent bucket and require every replacement-weight vector to match its bucket size. Cc: stable@vger.kernel.org Fixes: 5cf9c4a9959b ("libceph, crush: per-pool crush_choose_arg_map for crush_do_rule()") Assisted-by: Codex:gpt-5 Signed-off-by: Felix Hoffmann Reviewed-by: Alex Markuze Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- net/ceph/osdmap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index a639eab8636c2..b4ede3cbf18a5 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -362,7 +362,9 @@ static int decode_choose_args(void **p, void *end, struct crush_map *c) ceph_decode_32_safe(p, end, num_buckets, e_inval); while (num_buckets--) { struct crush_choose_arg *arg; + struct crush_bucket *bucket; u32 bucket_index; + u32 i; ceph_decode_32_safe(p, end, bucket_index, e_inval); if (bucket_index >= arg_map->size) @@ -373,10 +375,18 @@ static int decode_choose_args(void **p, void *end, struct crush_map *c) if (ret) goto fail; + bucket = c->buckets[bucket_index]; if (arg->ids_size && - (!c->buckets[bucket_index] || - arg->ids_size != c->buckets[bucket_index]->size)) + (!bucket || arg->ids_size != bucket->size)) goto e_inval; + + if (arg->weight_set_size && !bucket) + goto e_inval; + + for (i = 0; i < arg->weight_set_size; i++) { + if (arg->weight_set[i].size != bucket->size) + goto e_inval; + } } if (!__insert_choose_arg_map(&c->choose_args, arg_map)) { -- 2.53.0