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 EA09E3A3833; Wed, 20 May 2026 17:14:40 +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=1779297282; cv=none; b=Dv7/QZZ9ilbr96ag7y59Q1wLdZ0folnmbn+zhJNYNpqXdsjftigs0RXQVfEJWbZi8BnduQ+Cbn6pJX/dOuS4J1J4kqYc58mCwSe/TWvAA5SdDx3+d3WSANB+1M1rvvZu715cpkE7hslMuD0b+NQjN8PIZC0/+KZHxz68Xsk3HgQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779297282; c=relaxed/simple; bh=Pb9EkSAfdKYYUB0ULC0G4KKOJ4YvX2a8csTHwJFxNB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ucoFcDUVxmnUXj7qYJCZZBlWarQbjtBHpbbZd3zZ+sA6aCdsKz7+lBQPprjXQTW3hOOvQsc7LkPfB5KQPvbP36DYwAFronl3/SKukJEmFDEVojr784dqQlabBPNB2ct97lwQ6OxDgdTS9W7eT12fbHzhOEOByIBbR2wBNjMN0O4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gAf3VSMH; 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="gAf3VSMH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C78F1F000E9; Wed, 20 May 2026 17:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779297280; bh=6LMRrPcw4YWKmHAfHN6YrKULMNVWTzURLiZtYz4Az4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gAf3VSMHzYw9ezYtS+lHdiHamksQuPyn8Gy+2yw2OpxmsZDwFChSLL4pQYsdMfcmt XxmlIMWCQRJVN5KeWue21/3hCaYULfTMpBH9SGtz+/TdGZSg7VYXoTDGOvO5cvG1MW vtLgnP0U3qevgkEz67To+FIqv6dHJyulekzqmasU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Raphael Zimmer , Ilya Dryomov Subject: [PATCH 7.0 1118/1146] libceph: handle rbtree insertion error in decode_choose_args() Date: Wed, 20 May 2026 18:22:48 +0200 Message-ID: <20260520162213.544777296@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162148.390695140@linuxfoundation.org> References: <20260520162148.390695140@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 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Raphael Zimmer commit d289478cfc0bcf81c7914200d6abdcb78bd04ded upstream. A message of type CEPH_MSG_OSD_MAP contains an OSD map that itself contains a CRUSH map. The received CRUSH map may optionally contain choose_args that get decoded in decode_choose_args(). In this function, num_choose_arg_maps is read from the message, and a corresponding number of crush_choose_arg_maps gets decoded afterwards. Each crush_choose_arg_map has a choose_args_index, which serves as the key when inserting it into the choose_args rbtree of the decoded crush_map. If a (potentially corrupted) message contains two crush_choose_arg_maps with the same index, the assertion in insert_choose_arg_map() triggers a kernel BUG when trying to insert the second crush_choose_arg_map. This patch fixes the issue by switching to the non-asserting rbtree insertion function and rejecting the message if the insertion fails. [ idryomov: changelog ] Cc: stable@vger.kernel.org Signed-off-by: Raphael Zimmer Reviewed-by: Ilya Dryomov Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- net/ceph/osdmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -394,7 +394,10 @@ static int decode_choose_args(void **p, goto e_inval; } - insert_choose_arg_map(&c->choose_args, arg_map); + if (!__insert_choose_arg_map(&c->choose_args, arg_map)) { + ret = -EEXIST; + goto fail; + } } return 0;