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 28F05327C09 for ; Mon, 24 Aug 2026 11:15:09 +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=1787570111; cv=none; b=DX0Q80Hx735u94jf+nfVzWYFZ9NHof7bu5+c/01R8L/SlJus3ex2PQsEXetHHoFNa2SG0RROzWao7BM91kEjmWPFcKjWoaOc9okFpd4Qz7e41h5EFvo3CvnkPLMxrc8nI9CoJKYtdIjKu9mFoAUsTq8ZxZDMhTbe5w+1ZIbaPv8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787570111; c=relaxed/simple; bh=kmzK2hrS81LgMPXs+nqGgE98ltUrY5VIitB2R3iSehk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M67+y/VT2yBNBSEoQfpTwg+eSceVNIiMDbh9r4ZHNJjFDehcWwiArIsC2F0Yd5LM/2VdQ9W/kBjXvh6xe7nzWI0FVmUBhz9Sw7rDGYYZmq93Q1BsNimq2yeD2dcEIUUQ7j39EXDXTwnzQaOd3BRadkz/lpfdh/FYAE3QFNY6qAU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fK8LJlJx; 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="fK8LJlJx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 357141F000E9; Mon, 24 Aug 2026 11:15:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787570109; bh=X8W/k2kquH22JuPiHmuEW6TNZKJ20COeOmanXqLb12s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fK8LJlJxbuDvp3rOPE+j+hDVednFfCWZ9UID8/YTRJKTi+JYEeKbHHS2zgZNsRtTp f7oTrGn/9GQEbqqrnMz7v16PmwSOdtAdvamfJiEmtHVmJ+0+iNC/5Qjsh3bJqpB8Q7 3MwMEHv7Sllx7GQNrXd4HOB+ot40X4jTsSdjkTpBSnbJIL1scPytu2HOahxqSFt6dJ MQk1NBZtCrTLbkZW4lJ+o7RkP7YUefS6gNFXZ2DzyPEX6hVod3CUY0bwin4huz/NU7 p2kSioolPLaP4soUCb2dKhUxTIUAXEguFyCrjZSSIyaIUiT5ZcwIIArDvf96Uuauhf hzUzyZBOA5VZg== From: Sasha Levin To: stable@vger.kernel.org Cc: Pavitra Jha , Viacheslav Dubeyko , Ilya Dryomov , Sasha Levin Subject: [PATCH 6.18.y] libceph: fix OOB read in decode_watchers() via missing bounds check Date: Mon, 24 Aug 2026 07:15:07 -0400 Message-ID: <20260824111507.300824-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026082055-chug-kinetic-d689@gregkh> References: <2026082055-chug-kinetic-d689@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Pavitra Jha [ Upstream commit 00ead17c7de137a692edee59f2772e6af687e8eb ] ceph_start_decoding() validates that struct_len bytes remain in the buffer after the encoding header, but accepts struct_len=0 as valid: ceph_decode_need(p, end, 0, bad) always passes. When a malicious or compromised OSD sends an obj_list_watch_response_t reply with struct_len=0, ceph_start_decoding() returns success with p == end, leaving zero bytes guaranteed for subsequent reads. The immediately following ceph_decode_32(p) in decode_watchers() has no preceding bounds check. With p == end this is a 4-byte read past the validated buffer boundary. The garbage value is then passed directly to kzalloc_objs() as the watcher count. The sibling function decode_watcher() already uses the safe variants (ceph_decode_copy_safe, ceph_decode_64_safe, ceph_decode_skip_32) after its own ceph_start_decoding() call. decode_watchers() is the only site that uses the bare variant, confirming an oversight. Fix by replacing ceph_decode_32(p) with ceph_decode_32_safe(p, end, *num_watchers, bad), consistent with the established pattern. Attacker model: a malicious or compromised OSD in a multi-tenant Ceph deployment (e.g. cloud) can trigger this against any kernel client that calls CEPH_OSD_OP_LIST_WATCHERS, without any further privileges beyond OSD session establishment. [ idryomov: trim changelog ] Cc: stable@vger.kernel.org Fixes: a4ed38d7a180 ("libceph: support for CEPH_OSD_OP_LIST_WATCHERS") Signed-off-by: Pavitra Jha Reviewed-by: Viacheslav Dubeyko Signed-off-by: Ilya Dryomov [ kept the tree's `kcalloc()` context line instead of upstream's `kzalloc_objs()` ] Signed-off-by: Sasha Levin --- net/ceph/osd_client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 6d7d8c7d7d3fe..7108a3153a160 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -5033,7 +5033,7 @@ static int decode_watchers(void **p, void *end, if (ret) return ret; - *num_watchers = ceph_decode_32(p); + ceph_decode_32_safe(p, end, *num_watchers, bad); *watchers = kcalloc(*num_watchers, sizeof(**watchers), GFP_NOIO); if (!*watchers) return -ENOMEM; @@ -5047,6 +5047,9 @@ static int decode_watchers(void **p, void *end, } return 0; + +bad: + return -EINVAL; } /* -- 2.53.0