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 R. Howlett" <Liam.Howlett@oracle.com>
To:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Andrew Morton <akpm@linux-foundation.org>,
        linux-next@vger.kernel.org
Cc:     "Liam R. Howlett" <Liam.Howlett@oracle.com>, stable@vger.kernel.org
Subject: [PATCH] mm/mprotect: Fix do_mprotect_pkey() return on error
Date:   Thu,  6 Apr 2023 15:30:50 -0400
Message-Id: <20230406193050.1363476-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HZdboiY0KX755BfDkZROBwnPDSUdgBCsr8xaCAtUHIhBcj0m5Rm0HbMdCAwz?=
 =?us-ascii?Q?Y76B8fOW/Tmz/vdnyuA9BsTvVG6YeOYab099i3uwTOER6kOHOX9yRvQQy1ZK?=
 =?us-ascii?Q?taLfV4FU5lTs8T1HlqFoJfqJwiqkgTO7XXycFjdoh4AsVwMl3RLnnQ9Wcbtd?=
 =?us-ascii?Q?WhJH/iLH2uUzn8aYrceoM0GIy1l5S/yIA/WVa2bloTZC4n6tAXFHUTZUcBuB?=
 =?us-ascii?Q?Y1dqNohkpbvstGjo0R5/udW9/yVqPAGksNGRHkLPscW1HQn90FBFu2DOFSVo?=
 =?us-ascii?Q?0pErKjx8MIZW0qGaD3MH9YS3BHGxBSjCslLcetRpiUXjZsFPT2D0M+TJTQlu?=
 =?us-ascii?Q?2teg9a+ej2KIDM8Sxd+EA34/qDbf9FfSpfU7tfM8hd9nB8ezzliJr3qhrp4N?=
 =?us-ascii?Q?6coJIohBEtzJEFPUv/55SkmOrgYctCXcWd3tO0GhqilcY+Au7gBc1x5vFkjI?=
 =?us-ascii?Q?iAqgxMMSMGGxjx26K6aIXeCkmVlDa6dffoq3B4Q6L95Lft2MdtnBAUr7oSQt?=
 =?us-ascii?Q?agcsRgCr0ivfeAn4xaXvcfXZvw0Y3gg02R6jzrLLNUqC20vifU3Aq3fHcLhy?=
 =?us-ascii?Q?JGJEMM/ue2LR2NU5PZZozdmZeHb8UxpPWlcMOE/DHTBECg4mLDFNBXoQU/gU?=
 =?us-ascii?Q?NzDicp75GD0zitVzzwxv9JoGnpxFHMsfx+ekC9iPak89ihS7VUfD//AZBt/z?=
 =?us-ascii?Q?/togITrCBBIqx/9nM3SQuDsm+5o1CladbCqo5frPkcj4nm2InSPAkoHYj03f?=
 =?us-ascii?Q?5wh3oesdkyZKj483Rq14uHB9fSe2zu/pWh1e3ZC7UPrfo7mxAY+PLdJCJMhF?=
 =?us-ascii?Q?qdpPsneUvgOtV/ehpo6v/9Z4DRaR0Y6AI0tgbAEkcZKmuoGDqTi4mmVOZIsS?=
 =?us-ascii?Q?cqllv7/PeZsYV+BsnDsofnZYKZ5MC0WkKWBGBDdcAJZ/r62dzul/uRXZhg//?=
 =?us-ascii?Q?xI5lzsCh5pphMYs+3l6FcmE7js7m5Wlmckhsjp91nq59rDqR/QEJFt/6bUZB?=
 =?us-ascii?Q?sLP977dmX9/qxnBDUJhlSFRQmeO21dGp8raznpC9KBPvlFoUbYqlHCtMx6Nr?=
 =?us-ascii?Q?J1XyBx024SZNBq6zSJdP1KkSoouUNiLdXr+smJHHR91790j+lQlRspgHvcJE?=
 =?us-ascii?Q?QE7w3AF28qH7td/ZDG5wj6dH5w0Xb9Lf9wtyig5b4Ji7NqjHbawpK29wQH3X?=
 =?us-ascii?Q?cfK+PeY9Isljdx5AInJJHEw+w0DUMyWMrLzlqukaT7RfsRZMvfpxRfpkA0Ky?=
 =?us-ascii?Q?tGJvZyFEKZGs5NBxTX9A/DDHKIx7pMZXy6h3Q7B2r0AROGMfhmzAxirQaHyg?=
 =?us-ascii?Q?n2R+y4y/0lOdNAmR4VTVW6rJY+ZL0FnipO7b7DL2cFLkBymOcQarLQdyUDZr?=
 =?us-ascii?Q?zXslHrjHEcY1M3CQej2qQQv+RrGnnc+snaAvnwCapzGhxGZL/aXj4DyRRcHX?=
 =?us-ascii?Q?Ey2nTHwnRewgeKjV7WvaQfF1XUwNFBenSsxAvAvAbE4f3GPq6NX+L2ySLVGS?=
 =?us-ascii?Q?QkZdSZt8TaeKTKFCQdzAkZvM6UE8ipDlTdLnbt/Qvfh8OobhFKOKVnwYa6uf?=
 =?us-ascii?Q?7aZeyUn7P3zgxJQqn9gSlb87r+vnzHuV4nGAhAZtEzJgcQETh4m8WW3FjLx+?=
 =?us-ascii?Q?Uw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: luspfuYmu1LSoOZ5MTFMZgsgYUtjVSwFW/P91zBDxQc0uOmrvd56SkvMdRSlWESve4aSAApyZgbie1hLWaErqY1Sq7TbyR4epKIIIUTWMej35pw+9Dy5nJsHIkveH0TyM6Pw2EgqdMDdJRnmpBUe1AOdOLrSA/7qP3BAiKdJV4kQ7o8gtsWNPtro0j9W+LZYwK+9Wq6DGuZdec/h/yrTeELBkBQ3+kKzN2FYQbiqJjoXkXD6aju2zaISaolEKaxQZkmjPSvpukR4T6B3qbdU0dmRzqYrTgtElzk1WX8fVvOFvZnq2sI3MH3IhjsRSHGIeURDZ5IpWa0dwKevLoAsGv4pe9CKl3upw7uw0rw01cXxVvsONxy3QORJU1NtG3i8bc83sOBJ/kNCPH/ilzs0RTGiX+NPbqPioXGo1URis+OM28k3t0syc9D5N7QmmrRSkAB+GQQvwyfOWbXxLjdLg75bSXTRYLy04t6L3g+4fMd3jAi1DJB2fK4EcUWs7Qe8RSD1+u7FQWjOZsEf97suGrevHEtSFF9VIqMivDqhlUFMkaf+A8w7x9jRbxZSbPNPgVRuM7tZIZdRGzwzABHmvTPhQpkn4cuhoubFZ/0fAfz07L/Zt7tBNyht8ILw3BBGCNBvYo8shLPq+eizZN09qx8p+v3LHykKdoiS2jn+sylSSPmNZPDNwZEmbemJJ00m4aH8bHU3zDbBUcEzz3CfO62b0iNDqmROP1y/0FWApz9ji76YJmSjzXKZpQsrg9BZ6k/AX9J0zmXTyW+chuZTbV//c0Mtr8vhWfKjkvz/9hrPUgqGGf6Tal1oO++fV6EuwcVOiavMQYSm/JuOdMvwEQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e7809d34-28fb-4f88-fb4d-08db36d56fe5
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2023 19:30:53.8511
 (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: Uyzy/mBV+ytd4d6RChpFzQRBuNfxV0/Vj0xehjEPiW1dax5DfECdL20xMSBGTmv4gOvfmc6Ow53FbB7SXGqBPg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7053
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-06_11,2023-04-06_03,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 malwarescore=0
 mlxlogscore=999 adultscore=0 phishscore=0 suspectscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2304060172
X-Proofpoint-ORIG-GUID: NlOOFDXE8yEySdL3Ho6RcEnjUkqgemnC
X-Proofpoint-GUID: NlOOFDXE8yEySdL3Ho6RcEnjUkqgemnC
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,
        SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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

When the loop over the VMA is terminated early due to an error, the
return code could be overwritten with ENOMEM.  Fix the return code by
only setting the error on early loop termination when the error is not
set.

Fixes: 2286a6914c77 ("mm: change mprotect_fixup to vma iterator")
Cc: <stable@vger.kernel.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/mprotect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 13e84d8c0797..36351a00c0e8 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -838,7 +838,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
 	}
 	tlb_finish_mmu(&tlb);
 
-	if (vma_iter_end(&vmi) < end)
+	if (!error && vma_iter_end(&vmi) < end)
 		error = -ENOMEM;
 
 out:
-- 
2.39.2