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 AE20CC4332F for ; Mon, 6 Nov 2023 23:06:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233329AbjKFXGn (ORCPT ); Mon, 6 Nov 2023 18:06:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233317AbjKFXGk (ORCPT ); Mon, 6 Nov 2023 18:06:40 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6F1CD77; Mon, 6 Nov 2023 15:06:37 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B081C433CA; Mon, 6 Nov 2023 23:06:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699311997; bh=VHVJ13YZqdYKkwnFgKP74fWXjhwE0I38JVB17STLT78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iA7d/SNgwFFXZmKvRt2VOwbhJiEqG8BcRl4V0IEg79/ZXTBIOSEHVHiYToa756NQV g3aQLIbg6rvQGCkjRCqimQjhuFF3+cOUwztebjqA2syzd9n1l+fSegCSTj9FSmdRIO Z9mg78TtleqCEbYANwcSGlGzG0+XiD7ZVw0obzm/kxi7goDXAhxWbd8XQDz99/ZEuC qYxFwziPksSz93vjfO6/n4hGCfFywckwyq0MjxpjhzTSCRMkixOuUEy0EHRx7uvaAV a1Mm4yrcWdlxULZMtbIV/xJYA61+NdnINQUgMCbF+DFl380kKqcVPv/kxTyq7nOq+N PxKabgTRgpa4A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kent Overstreet , Sasha Levin , kent.overstreet@linux.dev Subject: [PATCH AUTOSEL 6.6 4/5] lib/generic-radix-tree.c: Don't overflow in peek() Date: Mon, 6 Nov 2023 18:06:10 -0500 Message-ID: <20231106230622.3734225-4-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106230622.3734225-1-sashal@kernel.org> References: <20231106230622.3734225-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kent Overstreet [ Upstream commit 9492261ff2460252cf2d8de89cdf854c7e2b28a0 ] When we started spreading new inode numbers throughout most of the 64 bit inode space, that triggered some corner case bugs, in particular some integer overflows related to the radix tree code. Oops. Signed-off-by: Kent Overstreet Signed-off-by: Sasha Levin --- include/linux/generic-radix-tree.h | 7 +++++++ lib/generic-radix-tree.c | 17 ++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/include/linux/generic-radix-tree.h b/include/linux/generic-radix-tree.h index 107613f7d7920..f6cd0f909d9fb 100644 --- a/include/linux/generic-radix-tree.h +++ b/include/linux/generic-radix-tree.h @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -184,6 +185,12 @@ void *__genradix_iter_peek(struct genradix_iter *, struct __genradix *, size_t); static inline void __genradix_iter_advance(struct genradix_iter *iter, size_t obj_size) { + if (iter->offset + obj_size < iter->offset) { + iter->offset = SIZE_MAX; + iter->pos = SIZE_MAX; + return; + } + iter->offset += obj_size; if (!is_power_of_2(obj_size) && diff --git a/lib/generic-radix-tree.c b/lib/generic-radix-tree.c index f25eb111c0516..7dfa88282b006 100644 --- a/lib/generic-radix-tree.c +++ b/lib/generic-radix-tree.c @@ -166,6 +166,10 @@ void *__genradix_iter_peek(struct genradix_iter *iter, struct genradix_root *r; struct genradix_node *n; unsigned level, i; + + if (iter->offset == SIZE_MAX) + return NULL; + restart: r = READ_ONCE(radix->root); if (!r) @@ -184,10 +188,17 @@ void *__genradix_iter_peek(struct genradix_iter *iter, (GENRADIX_ARY - 1); while (!n->children[i]) { + size_t objs_per_ptr = genradix_depth_size(level); + + if (iter->offset + objs_per_ptr < iter->offset) { + iter->offset = SIZE_MAX; + iter->pos = SIZE_MAX; + return NULL; + } + i++; - iter->offset = round_down(iter->offset + - genradix_depth_size(level), - genradix_depth_size(level)); + iter->offset = round_down(iter->offset + objs_per_ptr, + objs_per_ptr); iter->pos = (iter->offset >> PAGE_SHIFT) * objs_per_page; if (i == GENRADIX_ARY) -- 2.42.0