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>
Subject: [PATCH] maple_tree: Fix mas_next() when already on the last node
 entry
Thread-Topic: [PATCH] maple_tree: Fix mas_next() when already on the last node
 entry
Thread-Index: AQHYaf6xHLWX0jsZ6EaJM30X3oRPTw==
Date:   Tue, 17 May 2022 14:59:22 +0000
Message-ID: <20220517145913.3480729-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?S6jeCqC569v8ff/2ZCqwHU4FcJNQ8NeLuGsmVc794ApZdzPoQhxIMLnpOf?=
 =?iso-8859-1?Q?h3MhQpoAeLZKSbuTJSXjg1u6JLsmBLlRox4E77LES73eSWTXWAuhNBjUpN?=
 =?iso-8859-1?Q?V6Mf6Y1lk4uRqdTzcBH5GhQo4vedcRSDYu8fX9iGhQk90wYR9MIkIyryz3?=
 =?iso-8859-1?Q?nOGBv2zlnI1rUDe5EGQWFc3aCRHWDUnleOGFVfeLXnS+kukEUd6c3g8ycE?=
 =?iso-8859-1?Q?NlCLkILY1hjdro8rRzA8FROrXHSPN9J1p44JTEDN3x7+1zl+yquoRa0gSF?=
 =?iso-8859-1?Q?i5HtlrHg7FZzYXP5pLow7gC04/ajHu5ououGMnIXmZbtBSjojNOpfeqCts?=
 =?iso-8859-1?Q?lFjZRy4dpSkzaubNrG04w7AAah5zUr7lsn5o96gmXdHVgoTK7HJlir8c+U?=
 =?iso-8859-1?Q?cy0p3rfjNn38l7HvOE0acYfkOooLkOu4H9GgHFZ3HT3p/XraeV4TaeqB2A?=
 =?iso-8859-1?Q?L738fCTTiti8D9u97KfM+ahmJYKc5E2vpIfDCFs2IvTyXHFLIYa953c0XF?=
 =?iso-8859-1?Q?42fHx4E2WjQ49Xm/RzscW4zOrUHhqgphS4O8AhcLHW4Uuj9qw5kOMd+Q1/?=
 =?iso-8859-1?Q?t5hE2g7hHddum87xKZHynyYEwWwj0gJFWouXoeKbleHQJE6OtYnllJq0vN?=
 =?iso-8859-1?Q?r4y9Hgi1HwRz5zuLakzMvcBD7pI4UCWcXQseyM1PBwkze1qjN8618FRqXC?=
 =?iso-8859-1?Q?GAWw2M9QNShFZf8I5aGhfuw3r7+U/WMEf+lcxPZDhEnRlRKwMmo2D5RtDj?=
 =?iso-8859-1?Q?x2NJ/IXAJ0vrlVZrN8k5FzRHuZ3uMy56NXHXUTqxb3kpMJK55Sfwtw/YY8?=
 =?iso-8859-1?Q?T3E5Q6shhNFn2w+qZAIKCrVdjBHTFTxET7Ifmhj14T4cmNG0kOLXIBUCBt?=
 =?iso-8859-1?Q?EPNYRk5ARBMOfAmtbUObIz7BCo+Idze5a819H19U8M6G6MTjHYM6XRx0Cz?=
 =?iso-8859-1?Q?L8dEgLbBL/swxNkIAPCX5N3FkT3Rm7NyDLVcukMG2sCMNChlznIzUt+Pi7?=
 =?iso-8859-1?Q?+VuDWrgLxKokd6OyFdtJ13jzxCC/cnXXMC6Ij9r6ssbvxKIUeYk87Sk3mr?=
 =?iso-8859-1?Q?nUwrr68xXtJpsIfUonhqsbR2qkLSky7Lsg3lMRcVcbZVvToY8MZFK/9aS2?=
 =?iso-8859-1?Q?JeBvO2cT3yyg6a3lUUMx6XhNiN9a66feh3dUF317VYjTlU7gk3ha4UJmJ+?=
 =?iso-8859-1?Q?Pr0K8PR3FhCgF71V/odq9g0hAhf7ROC8uEPWQLsAbodFPGtHo7e/8ICS0t?=
 =?iso-8859-1?Q?zel/yYRQVXApWfCNCxL04mnl/fUyJ38i/ZrOaR/IN1/ViC0Y6pwG7IG8P9?=
 =?iso-8859-1?Q?Sd3wwSZjcVIIKHnYeBnWDs3ehfVukYHr5d96FJRMWdDGuiLvsuwJf4DQuc?=
 =?iso-8859-1?Q?S0+id4yZOLitWREnki0cfa7JeYUE5uVBWSQRgqIKB7NItNeRA50vruqSo/?=
 =?iso-8859-1?Q?o2DAHZad9Yu3Vg9cjXEmMxqEhVa4aGtXZCsPdzXq+yK24FMLqQ1CC/KNU8?=
 =?iso-8859-1?Q?aW4T27f/L9ON9ZLLJ5O/tfd7fe6/F7fKZh0oHdVwkbAqtEAtHCuUS16Bar?=
 =?iso-8859-1?Q?w4ejpoukZzWQAi08dPGw7GVzChs42YEO3emp30LqnoOBqxsvQEV4YQqqUv?=
 =?iso-8859-1?Q?FDG3t2zYxBvrHdMdx6rOAXc8K/qrK/tiFbuehzk8VyVy6F9j+ZIzq1JTWh?=
 =?iso-8859-1?Q?xAvrnh0NtdMoVMPpO7mPY1IZm6Inq6CpNDqvlerkI8mNiDua1BerFSjY36?=
 =?iso-8859-1?Q?cyXczic4CUutHJicbkAJW3i1a59h7x8iFa/B9phjgFUBpzuZhq3tSXoj6o?=
 =?iso-8859-1?Q?7P8HUg/eOEg3TOqG63sOMZ65hSdll0s=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: 704101b3-682b-457c-0cc6-08da3815d401
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 May 2022 14:59:22.8028
 (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: ywhZn4SeFgQY2th1dtoe8+XFfieVPhtYygGqn6aK2h/+QlrLsrux061G5QLhVrV3k2nDUcsNVd3t+VWXA+p/AQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2441
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.874
 definitions=2022-05-17_03:2022-05-17,2022-05-17 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 mlxscore=0
 phishscore=0 bulkscore=0 mlxlogscore=999 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2205170091
X-Proofpoint-GUID: hptB_MRkkelI4nv4L84zeJevY3nr6g7d
X-Proofpoint-ORIG-GUID: hptB_MRkkelI4nv4L84zeJevY3nr6g7d
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,T_SCC_BODY_TEXT_LINE
        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

It is possible to return the metadata as the next entry if the last node
entry is already in the maple state and the limit is not reached.  Check
for this condition in mas_next_nentry() where the node end is returned.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 967631055210..751aafd01c42 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4547,6 +4547,9 @@ static inline void *mas_next_nentry(struct ma_state *=
mas,
 		return NULL;
=20
 	count =3D ma_data_end(node, type, pivots, mas->max);
+	if (mas->offset > count)
+		return NULL;
+
 	while (mas->offset < count) {
 		pivot =3D pivots[mas->offset];
 		entry =3D mas_slot(mas, slots, mas->offset);
--=20
2.35.1