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 DE42F30C159 for ; Sat, 8 Aug 2026 02:51:43 +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=1786157505; cv=none; b=sQCvCaEmv/6fbA3g2ZIp1y8BvsitjX+SYRACJfXdqK5e25F0/8P/MiEVS+CAtF+veAoSEO5A5qRAL/3HkLvBmileCmef1tw1eO0cxgIEJT08JfLWVqoqLCZhUZ4/LjOq4owrCABBsKPyJmIJ4lmoHeZ3lQKnnE4xossTha2p0Aw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786157505; c=relaxed/simple; bh=QeCGu4GWe1sm5bWw53pbTS+iIoZZIgEkntEq0Yw/an0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=byXU76SD+ubAngvTjjykeuBhFIMiGkQ972cezJVt1qmGik5/uBWvWk6q4OWMnSxsyqgAd+/xmAYUDmcy4vmAvH9prvnBOSqfPCa934C1e8sWGVEwjBjIoadEQxbUz5MK+zco3+16Y6N3xKQqXWU6Z4Fz3Wwr5KmxnifKXzrnW8Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Piyn7RiV; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Piyn7RiV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3229B1F00A3D; Sat, 8 Aug 2026 02:51:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786157503; bh=lj/tKkWMLeK05VGA8ojKDEsAFIDDB5jU08carrxyvAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Piyn7RiVbsfTlJRmS4hDDJgMIde0wotRN4dk8tMnoj+9IfS2E4bTyqCoMhRLA27V8 lWsxodVkpWEj+F3daF/g2UcLxofXy6a7Ux1FNONQNbGklk756mJrcMTX+5a1Y0+jG1 MTQ2u9TjT8qNBUGRf3wCqlw2DQsJl+fodR8b7ZuGsildYAwqAfriEboIucaFXWExZV jjtvA1wRsJOE3QtR6Lt1thDMk0gmpyuugGKvulbY+Dv640c3CiY5jJcFbKzofInoJP POOaRhuCWieoym7vePg1nRoxTx029ms0kDbPfCIrKrWZaoj8YeTk/uSdSVO6kL9Xy3 xNO2hBxAZDWKA== From: Sasha Levin To: stable@vger.kernel.org Cc: Xiang Mei , Weiming Shi , Alex Markuze , Ilya Dryomov , Sasha Levin Subject: [PATCH 6.1.y 2/2] libceph: bound pg_{temp,upmap,upmap_items} length to CEPH_PG_MAX_SIZE Date: Fri, 7 Aug 2026 22:51:40 -0400 Message-ID: <20260808025140.4026434-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260808025140.4026434-1-sashal@kernel.org> References: <2026072929-reentry-rebuild-7ed9@gregkh> <20260808025140.4026434-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Xiang Mei [ Upstream commit 9f00f9cf2be293efe899db67dc5272e3a9c62717 ] __decode_pg_temp() decodes an user-controlled length but only rejects values large enough to overflow the allocation; it does not bound it to CEPH_PG_MAX_SIZE. The helper backs both pg_temp and pg_upmap decoding, and apply_upmap()/get_temp_osds() later copy the decoded list into the fixed-size on-stack array struct ceph_osds.osds[CEPH_PG_MAX_SIZE]. A monitor that sends an OSDMap with a pg_temp/pg_upmap entry longer than 32 thus causes a stack out-of-bounds write. An OSD set for a single PG can never exceed CEPH_PG_MAX_SIZE, so reject longer entries at decode time. The bound is well below the old overflow threshold, so it also covers the allocation-size overflow the previous check guarded against. BUG: KASAN: stack-out-of-bounds in ceph_pg_to_up_acting_osds Write of size 4 ... by task exploit kasan_report (mm/kasan/report.c:595) ceph_pg_to_up_acting_osds (net/ceph/osdmap.c:2617 net/ceph/osdmap.c:2833) calc_target (net/ceph/osd_client.c:1638) __submit_request (net/ceph/osd_client.c:2394) ceph_osdc_start_request (net/ceph/osd_client.c:2490) ceph_osdc_call (net/ceph/osd_client.c:5164) rbd_dev_image_probe (drivers/block/rbd.c:6899) do_rbd_add (drivers/block/rbd.c:7138) ... kernel BUG at net/ceph/osdmap.c:2670! [ idryomov: do the same in __decode_pg_upmap_items() ] Cc: stable@vger.kernel.org Fixes: a303bb0e5834 ("libceph: introduce and switch to decode_pg_mapping()") Reported-by: Weiming Shi Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Xiang Mei Reviewed-by: Alex Markuze Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- net/ceph/osdmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index e8f392658b20c..53e9c0e3c3d1d 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -1438,7 +1438,7 @@ static struct ceph_pg_mapping *__decode_pg_temp(void **p, void *end, ceph_decode_32_safe(p, end, len, e_inval); if (len == 0 && incremental) return NULL; /* new_pg_temp: [] to remove */ - if ((size_t)len > (SIZE_MAX - sizeof(*pg)) / sizeof(u32)) + if (len > CEPH_PG_MAX_SIZE) return ERR_PTR(-EINVAL); ceph_decode_need(p, end, len * sizeof(u32), e_inval); @@ -1619,7 +1619,7 @@ static struct ceph_pg_mapping *__decode_pg_upmap_items(void **p, void *end, u32 len, i; ceph_decode_32_safe(p, end, len, e_inval); - if ((size_t)len > (SIZE_MAX - sizeof(*pg)) / (2 * sizeof(u32))) + if (len > CEPH_PG_MAX_SIZE) return ERR_PTR(-EINVAL); ceph_decode_need(p, end, 2 * len * sizeof(u32), e_inval); -- 2.53.0