Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Jann Horn <jannh@google.com>,
        Lorenzo Stoakes <lstoakes@gmail.com>,
        Vlastimil Babka <vbabka@suse.cz>,
        Suren Baghdasaryan <surenb@google.com>,
        Matthew Wilcox <willy@infradead.org>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v3 0/3] Fixes for vma_merge() error path
Date:   Fri, 29 Sep 2023 14:30:38 -0400
Message-Id: <20230929183041.2835469-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?UwBnTrFy+wSCkdH9AniUGKOni61Yph61yxHDjNTr1o1EI3jD9jOPrhQPKnjD?=
 =?us-ascii?Q?K/H88NLHLFc9kQwW/Mq0zlpZxjx7l6zQCBKztssC/W5dBymZ4RAkEklIH2xN?=
 =?us-ascii?Q?QRLLaL2190K020uQZsvY/3jXE9Z49TyW/hZTi+pTt1frcZW62NJeZP22Mxrl?=
 =?us-ascii?Q?jvtbvEWRh+9Z+/ki5leVTrE9/GCA1DaFpxauvN8Uvz3EJi3SUHrPQEiuy9Ey?=
 =?us-ascii?Q?76VvVZ7xAMOpl7PwXWJlPsZw14DactY9bACP5rsDZjsNFYFD0EgVzSV4ibet?=
 =?us-ascii?Q?vsZHlDZguPt/2KiJQkNkwwABOdRZY1X3oFOZ8Ng/xaoTGxGj8yeS2OWOtsn0?=
 =?us-ascii?Q?BCGkb4+poLJXwUOXwTOcqzVhSVp7JyIS80bPKFhTVeqT0Z7cablmnap3DdKv?=
 =?us-ascii?Q?BpPnSSKO4ZZ8zc6Imojr3rWjNQoyEUSxKPZtzjRF1C75j6NV5NCUKctT5Rc4?=
 =?us-ascii?Q?FodSxB7srXxlIw+amcG4wEUvzE6lr4XbnmePAZQPdKEmLW7KLfWFsKyN+Whk?=
 =?us-ascii?Q?WWgXyxF/VYnH4RKcQaekCTCswBR1fams2fA+BE9IHtvKHmS/doVLiWG4VXIY?=
 =?us-ascii?Q?4b/tgboK0F17rUCsriFLhPupDvrwefMZTa59KnFztB++sFjjAHwVsB++xVJa?=
 =?us-ascii?Q?mdT9mpgYLGQU8XO9wGJJEUydyRitd9Aughs+pHggdISYgHGp1YVavFguzbyR?=
 =?us-ascii?Q?4qsqp8y5VwUVpjkR9LcTMvMgAy4TO2IbnWMbnH1mGYfwMzrfOaglD4DDOnHx?=
 =?us-ascii?Q?xWJWDC4bITDJkU+rNkz7mo10U4EA8brJNEQHfM4UifuEtlBeBBBdYWhEjsqo?=
 =?us-ascii?Q?8vqGEdhzY9D63aJH0wV52vd4CNbFfM/F9bBzCplHe1mpq/vwftsF2MmVLly7?=
 =?us-ascii?Q?WoyntjsCbpGrGb7HfSQfDqXxYkSKnANHcTCM9msmmXm7uD3eg+aXI5im+wez?=
 =?us-ascii?Q?0LsjIbqISibR9Boo6tOj4T7+Bsu54kZakR5skHuA80IiWjknY9uQWn5CYNfc?=
 =?us-ascii?Q?zypPDdMiwywrXV6JeJ95WVyxm0K9QDTdOvL8DmwTrgaxWJWbkLhO2fBTRru2?=
 =?us-ascii?Q?lzTqA5jtqpsP8pxPMhJniSEkCa0M1OCRRwazeUQhEQ6Mpwe9e7RlqVe3LFXL?=
 =?us-ascii?Q?P0+OcZVgqRMcqRMq8vLOKxXsPU37hqtnrrNk4l5HAzKVcDWXlBg2+cZTnf8w?=
 =?us-ascii?Q?cPCNLx8LA/aP+OZhC2SKKrjVBiIru3cmF+2ULsX7ltC731CkMpkzPZr59K2N?=
 =?us-ascii?Q?OrSKbvE7C+rRNL11O+3b/RlyMnESfKQACOXHkMXfHKMFnnBky3VqPj9/TIXJ?=
 =?us-ascii?Q?VSC8WDUp3W1oS18XOhOygvnFTt0kUrqT6VugNa2BpnA4ow+ebXqTeCK+49dC?=
 =?us-ascii?Q?XTco5WHT3oaAdXTm8quj0bv0REc0whE17o+98cNm0w+YnxMglFCH2zvtSbxD?=
 =?us-ascii?Q?sTXL9QxbQR7KgOa3v6tjWWYPMGnZF04TOMJzoWQICKcjw7pwAGtWxBRBIhwf?=
 =?us-ascii?Q?XuUhTduNDMsrM4l4fLL5VXluhBKEVy8Z5ehQRwh2HrkALVQKSxXKecBEfiXJ?=
 =?us-ascii?Q?3eDrYx+eAKUeNhGhaaoy9xx5PQeeqOBNuZ4uAEuQ?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?kjjvoYCjJ9QvcC0nsX4aq9WNCfHvLG549SN/BaKx/wTHvTRn97rqP1EZ0ExV?=
 =?us-ascii?Q?hDbs+zwtIBuAo7fEgsZxYGCarOzBRh99x9dHaIAyc/5CF6nPZMHGO8yXAXkE?=
 =?us-ascii?Q?UGodRmG+qYHSaulqqvoQzFKGK3qYNqDnmoC13ASWbbDAMHS4LKwz5js/QBpj?=
 =?us-ascii?Q?Eb/QkAWk97+1m5glJdiIQWiJNH1uGtCO4rE7WkoiLVt6gI2Qb2jV+BN1adpi?=
 =?us-ascii?Q?cVsUFFe2BbbzuWhEkr8wS5PJeO+4JANZon8eXWeexta1qsNxs9h4fIVmh6bQ?=
 =?us-ascii?Q?VIRuIluFYrgO7qti8tPLbsjIfaohhIja1h/LW6Xm7WGvToSMMaXZ4S6BOyOe?=
 =?us-ascii?Q?03RcOMiSCxnHT1ZWY7vD5kCJ1pyQGBnJpbEoqMmOjM6ITX8bucR3JRWAcbJf?=
 =?us-ascii?Q?1nd/EC0Ou/MM9u1VMieqvtvaR9tIqhRAZV21vaF3XHHyHKovo2cPTVYvEj7P?=
 =?us-ascii?Q?z6dzdXcVmYJkCcOZhw0CE2GqscLb8cbK32OthrUw/qcGydng2UbDwndl0hWk?=
 =?us-ascii?Q?sKWSqd0C1wcOBQGEuLEJZjQOZf0PZU2stcIjPOppLEHyrdeCWDmRITzDbY5P?=
 =?us-ascii?Q?I36ZZz8fSq9uRVpEUoYna6MioGwnX1jkdCg/nMMvBLS0tteK0OvdI07lZrZK?=
 =?us-ascii?Q?udF2CYXees0KxjsledDG2ChjRKHHuDw3JxpLn1FvJRf/RfiYyzsvBv9QakTf?=
 =?us-ascii?Q?zLF+5uWucBXNeQA/D4czHcA2FYIO01r5cIzYIlTGTJ2VJgia/kBbZGNStUlQ?=
 =?us-ascii?Q?1DfSZ4zVltucmL3hPezMYPcErotwdFmkxIFnlk3zPjVzX7IxEnXSplSwGovx?=
 =?us-ascii?Q?ZcbHQq/DwYiNKyCrmjtgphjdBhV+5p2idxbPrfiGTmamSyfM/+rGLTxNp168?=
 =?us-ascii?Q?S3qdK5ImNjUEtE3pe4Ms+l7IX4pGzaN/rt4+Jdr+Q1SdMD92jpCSz0kA1fQo?=
 =?us-ascii?Q?RAQ1jZKQwHDK8qkIvNOUgA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2778f911-50ca-4dad-1d42-08dbc11a329e
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2023 18:30:46.7183
 (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: QnPcC/BbcBY21m3FxsEp+wLldKGxuQmH00vmtykkYr1SUi0ud6A8/7X7xFJ0ugvlTaMj2qDCY94GzgWFisLO+A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB7482
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-09-29_16,2023-09-28_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=559 bulkscore=0
 suspectscore=0 adultscore=0 phishscore=0 mlxscore=0 spamscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2309180000 definitions=main-2309290160
X-Proofpoint-GUID: GpvI_SnBfxkjuax37aBSHxoDfQNObRhj
X-Proofpoint-ORIG-GUID: GpvI_SnBfxkjuax37aBSHxoDfQNObRhj
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 29 Sep 2023 11:32:14 -0700 (PDT)

Jann Horn reported a potential vma iterator issue in the failure path of
the vma_merge() code.  After examining the interface, it seemed the best
course of action is to simply add an undo path in the unlikely case of
an error.

On examining the vma iterator issue, another issue was discovered that
would increase the memory usage during failure scenarios, so this is
addressed in patch 2.

Since it is unclear in the code, another patch adds comments to the
vma_merge() function on why dup_anon_vma() is safe in 'case 6'.

Changes since v2:
 - Updated dup_anon_vma() comment to include new argument.
 - Change vma iterator undo to a reset and rewalk to ensure
   vma_iter_config() changes are dropped. - Thanks Vlastimil Babka
 - Update user visible changes in patch 1 again. - Thanks Vlastimil
   Babka
 - Only set the anon_dup vma when the duplication is successful. -
   Thanks Vlastimil Babka

v2: https://lore.kernel.org/linux-mm/20230927160746.1928098-1-Liam.Howlett@oracle.com/
v1: https://lore.kernel.org/linux-mm/20230927160746.1928098-1-Liam.Howlett@oracle.com/

Liam R. Howlett (3):
  mmap: Fix vma_iterator in error path of vma_merge()
  mmap: Fix error paths with dup_anon_vma()
  mmap: Add clarifying comment to vma_merge() code

 mm/mmap.c | 45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

-- 
2.40.1