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 0A5883EC82D; Mon, 17 Aug 2026 14:10:33 +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=1786975834; cv=none; b=frCB4P+NLotCHSXci9ARqDmXC08K7yeiUbrP+eTE/8lJPPF7DHp0adIAA63jA/oOxhqdeQS0fZx6z5NluObvqOmnzAVaNJFjOTqR60dvYogDVgFh1Qn4OwcjScnSdWK5KIShn1GH92kcVpbppTTSImBBE/w7Ggp600umwwG1d2I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786975834; c=relaxed/simple; bh=hYV/sxgOnNSPhtUDM5WdtrUzbRubaBwmn0Z4rVDJuS8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aVYkHdnTVMcVVzBrKLwcqmZNVA05rXZdhIjHP2x7Ve+kXrAXgwcBAltosIpRWlOWohbiOWGGwXOTXRTzWhLN4X4zikXtX4bw5GWV0QwBsH2Aen33SC1AwTwy5vi47msu6NZpTVRNSi+b2rXWkVOn8cilx8hu7YRqhEBLVr4RISU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wIRWwc79; 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="wIRWwc79" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AC591F000E9; Mon, 17 Aug 2026 14:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786975832; bh=m/cQeXxC9+t6jIzom8BJk/+ISdUWy4zj/76xX9I+zR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wIRWwc7929TrZvQl9ZX+gBwDAGTO89eVmRHLiCRJEgfNuGe6jBHNwbvU4CKqFb/ut 0F4IChCjVpUlRDIlgtC9RpPqUJrFw1LXxYBXkI5fQVVRB9k3qLkgfDNdRMpv4qxtVw EUlPERwm+J1KhCLJ8CKqWQpbSiq1a3YT95TQmhM0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuan Tan , Zhengchuan Liang , Xin Liu , Douya Le , Ren Wei , Ilya Dryomov Subject: [PATCH 5.10 165/389] libceph: reject zero bucket types in crush_decode Date: Mon, 17 Aug 2026 15:30:04 +0200 Message-ID: <20260817132545.618462253@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132538.796021292@linuxfoundation.org> References: <20260817132538.796021292@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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Douya Le commit 05f90284223381005d6bcddab3fda4a97f9c3401 upstream. CRUSH bucket type 0 is reserved for devices. The mapper relies on that invariant and uses type 0 to identify leaf devices. If crush_decode() accepts a bucket with type 0, a malformed CRUSH map can make the mapper treat a negative bucket ID as a device and pass it to is_out(), which then indexes the OSD weight array with a negative value. Reject zero bucket types while decoding the CRUSH map so the invalid state never reaches the mapper. Cc: stable@vger.kernel.org Fixes: f24e9980eb86 ("ceph: OSD client") Reported-by: Yuan Tan Reported-by: Zhengchuan Liang Reported-by: Xin Liu Assisted-by: Codex:GPT-5.4 Signed-off-by: Douya Le Signed-off-by: Ren Wei Reviewed-by: Ilya Dryomov Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- net/ceph/osdmap.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -504,6 +504,8 @@ static struct crush_map *crush_decode(vo ceph_decode_need(p, end, 4*sizeof(u32), bad); b->id = ceph_decode_32(p); b->type = ceph_decode_16(p); + if (b->type == 0) + goto bad; b->alg = ceph_decode_8(p); if (b->alg != alg) { b->alg = 0;