From nobody Mon Apr 20 01:11:41 2026 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 1C115C43334 for ; Thu, 23 Jun 2022 13:32:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231387AbiFWNcj (ORCPT ); Thu, 23 Jun 2022 09:32:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231907AbiFWNcg (ORCPT ); Thu, 23 Jun 2022 09:32:36 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CFB23E0C2 for ; Thu, 23 Jun 2022 06:32:34 -0700 (PDT) Received: from dggpemm500024.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LTLjj53M0zdfwY; Thu, 23 Jun 2022 21:30:49 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500024.china.huawei.com (7.185.36.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 23 Jun 2022 21:32:32 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 23 Jun 2022 21:32:32 +0800 From: Yang Yingliang To: , CC: , , , Subject: [PATCH -next] mm/mmap: fix error return code in do_mas_align_munmap() Date: Thu, 23 Jun 2022 21:42:37 +0800 Message-ID: <20220623134237.2127440-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Return error code when munmap_sidetree() fails in do_mas_align_munmap(). Fixes: 81f5504dfb36 ("mm/mmap: change do_mas_align_munmap() to avoid preall= ocations for sidetree") Reported-by: Hulk Robot Signed-off-by: Yang Yingliang Reviewed-by: Liam R. Howlett --- mm/mmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 1bdf56804048..bb978061a790 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2427,7 +2427,8 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_a= rea_struct *vma, =20 mas_set(mas, end); split =3D mas_prev(mas, 0); - if (munmap_sidetree(split, &mas_detach)) + error =3D munmap_sidetree(split, &mas_detach); + if (error) goto munmap_sidetree_failed; =20 count++; @@ -2435,7 +2436,8 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_a= rea_struct *vma, vma =3D split; break; } - if (munmap_sidetree(next, &mas_detach)) + error =3D munmap_sidetree(next, &mas_detach); + if (error) goto munmap_sidetree_failed; =20 count++; --=20 2.25.1