From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93D83C433EF for ; Tue, 18 Jan 2022 03:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345164AbiARDnH (ORCPT ); Mon, 17 Jan 2022 22:43:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345928AbiARCz1 (ORCPT ); Mon, 17 Jan 2022 21:55:27 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D3FFC02B868; Mon, 17 Jan 2022 18:44:09 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D6F9E61118; Tue, 18 Jan 2022 02:44:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8283BC36AE3; Tue, 18 Jan 2022 02:44:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473848; bh=Lqn3vSoFlKiqqZwJh+JyEU5SZY1cUlLW87QVRtDJf+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cqh/jHl2MRUmzaYEUI9liV80ht9ZWRSu6XBAfIglAIvKwmOS63suhib1RSp0MUitn t/9QSh28BS1iGq1SDlwcOAfJFXb2Yz0AX7/omE+R9o5poQB1Eoex0HvMfIKkz/E6JZ y77vBoJXoKNVEf+/+LaFyvDR1/N9lwsxVpuu2LAkpQ663GuM1dNdHyZ+2BpV6uSIBN OTUWFNbPpKAmVZgIKytrdVrihUaiGuqxb3e7LzUGtdnwb9cHv5bxniXW1S77O+oO1v lNRzx032ThgzVgNcvtZCrzzbkwyOiMySEtbFGaUj9dU8wL5uZNcAu9hRP6DAF3kFsg DQNnTBrpIAXtA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Joe Thornber , Mike Snitzer , Sasha Levin , agk@redhat.com, dm-devel@redhat.com Subject: [PATCH AUTOSEL 5.10 103/116] dm btree: add a defensive bounds check to insert_at() Date: Mon, 17 Jan 2022 21:39:54 -0500 Message-Id: <20220118024007.1950576-103-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118024007.1950576-1-sashal@kernel.org> References: <20220118024007.1950576-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Joe Thornber [ Upstream commit 85bca3c05b6cca31625437eedf2060e846c4bbad ] Corrupt metadata could trigger an out of bounds write. Signed-off-by: Joe Thornber Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/persistent-data/dm-btree.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c index ef6e78d45d5b8..ee3e63aa864bf 100644 --- a/drivers/md/persistent-data/dm-btree.c +++ b/drivers/md/persistent-data/dm-btree.c @@ -83,14 +83,16 @@ void inc_children(struct dm_transaction_manager *tm, struct btree_node *n, } static int insert_at(size_t value_size, struct btree_node *node, unsigned index, - uint64_t key, void *value) - __dm_written_to_disk(value) + uint64_t key, void *value) + __dm_written_to_disk(value) { uint32_t nr_entries = le32_to_cpu(node->header.nr_entries); + uint32_t max_entries = le32_to_cpu(node->header.max_entries); __le64 key_le = cpu_to_le64(key); if (index > nr_entries || - index >= le32_to_cpu(node->header.max_entries)) { + index >= max_entries || + nr_entries >= max_entries) { DMERR("too many entries in btree node for insert"); __dm_unbless_for_disk(value); return -ENOMEM; -- 2.34.1