]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commit
libceph: handle rbtree insertion error in decode_choose_args()
authorRaphael Zimmer <raphael.zimmer@tu-ilmenau.de>
Tue, 12 May 2026 07:29:30 +0000 (09:29 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Tue, 12 May 2026 19:00:58 +0000 (21:00 +0200)
commitd289478cfc0bcf81c7914200d6abdcb78bd04ded
treec7b5e195ca3863f67530705c8712be34a82c10af
parent35d0ed82d03e5ee77ea4f31f20e29562a7721649
libceph: handle rbtree insertion error in decode_choose_args()

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 <raphael.zimmer@tu-ilmenau.de>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
net/ceph/osdmap.c