From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 589363A1CE4; Thu, 15 Jan 2026 17:10:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768497029; cv=none; b=s7b1EAXdDE5BiQkbuQ9kDeA+Bidrs4uZoAfArMlsw2falZ0vtrhg56boe0ipyEupmGYoyHDhO8BaUZnU9/JThmlqhDdBCawOprhWgm4dhzIn1wpGG7kVe3sYATWEZpdGmugjr8LIwiZqo/82VYadEAZkbUnq1dH3e49qolRGcG4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768497029; c=relaxed/simple; bh=x62ru25d5RcWtU4x51PQtlmCCVy4J8MqoPgZlitBga8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ApO3HlV8vh/ZFFa1BE52rWondi/TeRVNsRpEYldlqau7SO5W1P4IesKlyuntqteLyyyPMx8PJByMmewlVKes0mHqpxbUMWYEKoYwrL4qWTj7ohmxtYNv8644X8loqb8JSBbPTDozGvdCRo+j0uCRARchj/E+1cbVJVzWgitbH7Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LHPig3R/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LHPig3R/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7E98C116D0; Thu, 15 Jan 2026 17:10:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1768497029; bh=x62ru25d5RcWtU4x51PQtlmCCVy4J8MqoPgZlitBga8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LHPig3R/b7ZCuaaTfN563i5vxxBfT1QYZBqH5iZZEsqaJocbUuwakJfD4fqC5ZKxl mHpb6yalQ5zgdyp7QRW4mkNCTeoPku9zBfGdrmAmAxH6C0stZ01w0FQgb2296JtBuT 35awec1Tu1aBjTY0I8T1vvqFeeymK7WTa/375ydU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tuo Li , Viacheslav Dubeyko , Ilya Dryomov Subject: [PATCH 6.1 12/72] libceph: make free_choose_arg_map() resilient to partial allocation Date: Thu, 15 Jan 2026 17:48:22 +0100 Message-ID: <20260115164143.936776113@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260115164143.482647486@linuxfoundation.org> References: <20260115164143.482647486@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tuo Li commit e3fe30e57649c551757a02e1cad073c47e1e075e upstream. free_choose_arg_map() may dereference a NULL pointer if its caller fails after a partial allocation. For example, in decode_choose_args(), if allocation of arg_map->args fails, execution jumps to the fail label and free_choose_arg_map() is called. Since arg_map->size is updated to a non-zero value before memory allocation, free_choose_arg_map() will iterate over arg_map->args and dereference a NULL pointer. To prevent this potential NULL pointer dereference and make free_choose_arg_map() more resilient, add checks for pointers before iterating. Cc: stable@vger.kernel.org Co-authored-by: Ilya Dryomov Signed-off-by: Tuo Li Reviewed-by: Viacheslav Dubeyko Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- net/ceph/osdmap.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -241,22 +241,26 @@ static struct crush_choose_arg_map *allo static void free_choose_arg_map(struct crush_choose_arg_map *arg_map) { - if (arg_map) { - int i, j; + int i, j; - WARN_ON(!RB_EMPTY_NODE(&arg_map->node)); + if (!arg_map) + return; + WARN_ON(!RB_EMPTY_NODE(&arg_map->node)); + + if (arg_map->args) { for (i = 0; i < arg_map->size; i++) { struct crush_choose_arg *arg = &arg_map->args[i]; - - for (j = 0; j < arg->weight_set_size; j++) - kfree(arg->weight_set[j].weights); - kfree(arg->weight_set); + if (arg->weight_set) { + for (j = 0; j < arg->weight_set_size; j++) + kfree(arg->weight_set[j].weights); + kfree(arg->weight_set); + } kfree(arg->ids); } kfree(arg_map->args); - kfree(arg_map); } + kfree(arg_map); } DEFINE_RB_FUNCS(choose_arg_map, struct crush_choose_arg_map, choose_args_index,