Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Liam Howlett <liam.howlett@oracle.com>
To:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Dmitry Osipenko <digetx@gmail.com>
Subject: [PATCH] maple_tree: Fix mas_alloc_nodes()
Thread-Topic: [PATCH] maple_tree: Fix mas_alloc_nodes()
Thread-Index: AQHYpqcmPt7CdAaAQ06YVNNnxmjt4w==
Date:   Tue, 2 Aug 2022 19:36:24 +0000
Message-ID: <20220802193612.2886170-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?9ZDW431QX7/gigK0eWzeqQ62Ff402CZs+XA7b5h1FvWi52ke23k9sZkz9Q?=
 =?iso-8859-1?Q?XfqI1FjFQHfvaTVYmR7h+0W3OvRNRCP6um0TFOgETn1RmxzfAKYQGnFU7E?=
 =?iso-8859-1?Q?Hb+NlsoOZyZG2xyXsGXjPSVfWsUEac7Btmnv1EeZhRe5sDcdRWEDAtJHGj?=
 =?iso-8859-1?Q?RiiHM4TWxKKh2WCMH5I/4GePNFw/hrgsSh/BtFa0bMvM0FWtY9YUGjR7fk?=
 =?iso-8859-1?Q?NHwNmzM9Wpr8uDRlB4JT45S7P/7oKGc5swVc/NS2t0H/YyvmBOMGUGHeBH?=
 =?iso-8859-1?Q?NhDDlgCq9KzVa132XRmhWRDwgDKbsT3jotCfaCaoqyn1VY0yv6io1O1kG4?=
 =?iso-8859-1?Q?lWjfAn4Hebw2coaTvyCV9H2vEMC8u2vCmAblIhmGUbajxLxc+oHwlhURZY?=
 =?iso-8859-1?Q?4bHnFEwlbv+YbRm4bQhzPkcC3cRuHHn8CkeGynTI4C0pThZyNSbzhxhgoG?=
 =?iso-8859-1?Q?6gdDkjUwIb4LvPgBTCKXaZYJc9d5N1e86LBm8iC1NSYEJjURTwUDZ90rS5?=
 =?iso-8859-1?Q?scnQxdjFizu7bNCr0rzBuf2PEhz64yz4LLky46HvHQ28hqqEJb9ivhhwmu?=
 =?iso-8859-1?Q?UkPgVpg1CsVYwqXzD4+lQr6yOA1JOe1SyCN7z6qwHAyB1ntbaxMW17VXim?=
 =?iso-8859-1?Q?2586dwwzQ1k6lt12wb1rILmFDcwl2NTLx4s0xc4wWm7pttCbTG+kr6KNWV?=
 =?iso-8859-1?Q?ngqCOM6d/ywu0shC3O5z4KORem5+ImvrYw/BOeYLTHTKsQ+6mtIi1Gp3aj?=
 =?iso-8859-1?Q?2u0zB72SKRtD0fJZdplWJGdF/o8LDHb2kDQ8Vf3f+xj6/178SVQ+22M0oj?=
 =?iso-8859-1?Q?LG/XgtbsPexnp8iYgdKKW+eTqYoPMZaD8WIyNYRACO8aT5r0CX0ETcn/j8?=
 =?iso-8859-1?Q?SK8neab2nPZ6O7QaxH/DpwR6HwImDp3/QnSCUzMvezSuvH1cYbTfIGbqI/?=
 =?iso-8859-1?Q?3Cm8Fq0R3v2Vjw/WdubPG6FJYQu21n/3jSg9E+UQgFi6of7CEzvBGlLNlA?=
 =?iso-8859-1?Q?7OkiqEV4u+55gE1zdksq5DYOyWISte5Uqt1GNX3fcC7q1SwkN573o5JkI6?=
 =?iso-8859-1?Q?jg29W1BzsCqGA9n8mbnyw945L68lN6M2vdcy52FFEg3sAXUTSSID3ML3Ji?=
 =?iso-8859-1?Q?Hv5npV3F4WWbbP7iqXpE5IBvHs5XWyn6lKoURDBXNUn8cS/Ww9qt3OoR8R?=
 =?iso-8859-1?Q?8uiNU158qveDOdAI85L9CWIOlisQeuaQHFxl4T8iQ0xn0wisvjlkLmcZuO?=
 =?iso-8859-1?Q?3/WHii3I1/pVlaJfIjl1tfodtDw/40g2DlAvJwFiVHy9Xz9oUDKQYyCPK4?=
 =?iso-8859-1?Q?e5Z4v7zUIp9PutrRCah+DJYZTS6QvTBH2Uq5y8eOevWxLbXkNC+bmPWPwa?=
 =?iso-8859-1?Q?43A5N+hsR7a+92ZsfVZyxGzXxTIme8bMhYqvpskqmrQ+/2W9zs6rh7DxCp?=
 =?iso-8859-1?Q?sgxilnAHR6UlCi8xqeahntBvm2GSCH+5rtGqE6h+raSXpP/Pe9YrHZb6U2?=
 =?iso-8859-1?Q?uLfXdiEErMa40cWKw0V+b92VWIjlkLHzbtTHjYWkg0rnCQy13ecEJxjSFB?=
 =?iso-8859-1?Q?+RWmWnvExm+BzRo4c+LdyFDuv64wlJdR7KCMZHvx1Zbx+a7x8OQqfw5H96?=
 =?iso-8859-1?Q?kEgMxkHj9M1JNiuioxwHo33PI+j8ONKKN7XRlNDOL6YpG01m2B3Wl2Sw?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5a45c4ef-c631-451a-980f-08da74be494d
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Aug 2022 19:36:24.8464
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: CTroW4Dd9r4wkH/MKikcYldIWuImNzh9CeUI2MCLfiaE8ihm+YkJf7NgTjRMI/VFUleUlDqVcuyQxpiS07V3YQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2985
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-02_14,2022-08-02_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 phishscore=0
 malwarescore=0 suspectscore=0 spamscore=0 adultscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2208020092
X-Proofpoint-ORIG-GUID: K83p2HAFPK9HS8k1i5nQVflDQAaaxntS
X-Proofpoint-GUID: K83p2HAFPK9HS8k1i5nQVflDQAaaxntS
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use MAPLE_ALLOC_SLOTS, which differs on 32bit.  This was causing an
out of bounds issue on 32bit bulk allocations

Fixes: 06b152b7980a (Maple Tree: add new data structure)
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 4e41f3394114..032e7bb0d44f 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1242,7 +1242,7 @@ static inline void mas_alloc_nodes(struct ma_state *m=
as, gfp_t gfp)
=20
 	node =3D mas->alloc;
 	while (requested) {
-		max_req =3D MAPLE_NODE_SLOTS - 1;
+		max_req =3D MAPLE_ALLOC_SLOTS;
 		if (node->slot[0]) {
 			unsigned int offset =3D node->node_count + 1;
=20
--=20
2.35.1