Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, 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>, stable@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v2 3/3] mmap: Add clarifying comment to vma_merge() code
Date:   Thu, 28 Sep 2023 13:16:34 -0400
Message-Id: <20230928171634.2245042-4-Liam.Howlett@oracle.com>
In-Reply-To: <20230928171634.2245042-1-Liam.Howlett@oracle.com>
References: <20230928171634.2245042-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?ADAsGMURm9w3fG1K3krse0Y0Nf6Q2DvNa1gg2r/q0CYfjBBb8dKqSXDZL+Mn?=
 =?us-ascii?Q?weG9gMzPl/FhWs/hJRsZLQLLJtr4Pt6XulR7Nzrc4JNhXS6H9oQ8URy1DLFb?=
 =?us-ascii?Q?1OpPN7hA4vWrw2bPulf2Jfu9ynI1Rr6OVO1gCFAUJ5YAwCd90a+LYLmBp/WX?=
 =?us-ascii?Q?9ItybcuTKZD50CZIY574kdHoMJX7HYMMworCWHC7QAP2dfQc8VJEFBvbmzBa?=
 =?us-ascii?Q?dBGhYnAf6kG92SbRNaQg1H+WmWDuvfVDdVmt7xq7oJLLSLYSH3AUX3Igwvwh?=
 =?us-ascii?Q?y+rGhVrTYwqbolHIsIFPz8bDCRII01z+fNz4xYMIMr4TJ4mOoA88R1fhKZeE?=
 =?us-ascii?Q?gMfcgGG3QmvjiTXoOumAHHhyGCiTlFPXZ0a5wkRcFTYhTnQPbG4DcdPOjFxN?=
 =?us-ascii?Q?Z9itjwnLgLbJrPjRxvYPdDsCl+8nOmm0JK3MAE7q2A40DMIbx+x/fEo6pTh5?=
 =?us-ascii?Q?84i6s2JZ+FHbSOe7z/0AgnvBe1uamMhLp8xo61hzIEfZdTs5PSxLUH5D2FRJ?=
 =?us-ascii?Q?6xABOKJNIHkDYysk7vlTcdmOgAGb4zBoRS5NGJOWgn/0bkQ9UDrzBrCLTYj8?=
 =?us-ascii?Q?R1ieejsoQlIyJqvg2LxPjXMTQlCfuKatoXMlZ3kF5g74inqLx/FHPLAORWPO?=
 =?us-ascii?Q?U9Ctk7l+n3TYssMpknit3UwEw3CsHiRrai9aNeoG/CQ0eFmiVNhZ0oaZ5XZ+?=
 =?us-ascii?Q?mCGKWKBhs/YKFjL+Y4NR6V9YhVSsQ/Wc4VB3TB6wWbKDspKWVmelHRgIBG6D?=
 =?us-ascii?Q?Ra7XFAfTeTz/tCFIz4cjQIAEaXzt4KZFrIMYPNTUfIXLVg1pjs48EGtM1uGf?=
 =?us-ascii?Q?NyenCrqyHG7lEWYimTUx3R+p1N+S6dNFyHWAeg7slvHzgZwUI0cK6zIBS42W?=
 =?us-ascii?Q?9zv4N7zeQr/rJqJvzIB2iE0S+STn1wUawUmSmcfeCSZWMmyTlbQrTESg/8Pf?=
 =?us-ascii?Q?tjSCg8qY8uvt0P6MbHe7Pm6Ug8xXFuWGb4egn+XGrAUqGBTQUNp4Y9NdJu+S?=
 =?us-ascii?Q?zHmpj8JlPtvuw1gA9jVGNYcVxbZesCnSQCnhh+lMjIGiWwUT5+3IIXQBpEiL?=
 =?us-ascii?Q?OppNDyzoxi65C+uGZCsnswpP9Hs4og+Jvcx4c6rMWWXvDOePifkR5iAi5vGD?=
 =?us-ascii?Q?2H5X7Uh65ezHWsyqPbSCzW2XnavC4lB0tOv8Yb6hM9Pz73GdT9Kk00c8vd8y?=
 =?us-ascii?Q?Ot/L4Ry+vcYH/z6PHaDkj4h9VDHWeRDT2L/ms5KBgfSEL2Z+e4y5U1cTj+5Q?=
 =?us-ascii?Q?ltQQveLE2CZLjZQN+kKHfeD4HRZAxu1uwof6XK9tWpm6L00FH5OtgjWqGth7?=
 =?us-ascii?Q?bO9iiG53wiDpONDbHHd1ggH4lFqdV9efr6YblPssa31eaha7ixzdVvpA3eTU?=
 =?us-ascii?Q?Nr67Ea2ofJxXZ3FMUA2X2oujN5KSBrDiyE/gGimTeHn5d86E9olAHoEpT3n0?=
 =?us-ascii?Q?VJny9taOOs3NrGDmMsTzESfGy30CODBO1X9HmRZiEWuEmPjoYHCkZG2ThOyt?=
 =?us-ascii?Q?aj8JJndPZy/7YC/G3pfeNhjy7HNY8G1ngxs38dp9y48q+Ls0uM70jUJcm3jr?=
 =?us-ascii?Q?n05MiNxAs5FVIcPByEUzAkvngKZI3rFtN34MlqJ7?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?sTVEtd+Ic79NTFO1qjZpMSVvfILmF+frRaUj5aKNKygfUPM4TE/m3CEvXQ4q?=
 =?us-ascii?Q?KDSONYwm46CjFNmYkMpKe8+cq/6Ii+4cZIUhqWz7ugUoI4v69epvx5XT+t2o?=
 =?us-ascii?Q?/HM5yIf0PGXQevxsRCSH8qeBsn/yZAEvtJceaPqVx/bFriJy5pXK0HxUzXo0?=
 =?us-ascii?Q?G26QDLCQ1mnYxNojSrGJc5ffi3kAvz98/6x5UtK9/7Rw7Wb8NtxsMA7Seggn?=
 =?us-ascii?Q?drXeOtrJp0sd4o/c2ClP1W4iA0aVZ58RQdh57LlQIW3o+21uGeE4rB3vpcvz?=
 =?us-ascii?Q?G1aL+iwaend48be999zJAFco8LzJ355ZKWgIKoiIUiUoZH8PyhoaHXXO64Pf?=
 =?us-ascii?Q?4Riu79djuYBulWU4N4o8tGFy2m9gxW4ZGEJ5HaASxyBC76QgV02w86ieA8o6?=
 =?us-ascii?Q?p/kwmU5EiLiBePzM5tEsrOEa65dKvatG6Tg0Rl7NRK3HSVVWvkUM9yFBNK4j?=
 =?us-ascii?Q?GHAjOSzXExkm/doMrpZwKow1Njw2l9lhIbRyNoiF9Qd+D2YxJor/UkO2V8+p?=
 =?us-ascii?Q?pTdJHaocvhnz/zR+zsK640oVmd0UO/jnE8mRXoK3AiW6TmE3iRwD3Nc73NXj?=
 =?us-ascii?Q?Iwsl46HWFASCkYLdIN+OzUiDhq6uBNgJ0bI10vrZm4N4BRrVmU7pCtmyKKre?=
 =?us-ascii?Q?nT29XNWSocJlkLQlDS8sJJdOVo4d0cbm4iBMS4r+vcFyxWZlCepNemQFhSeL?=
 =?us-ascii?Q?Dg58S9e1z1iMuT4sbRrJqLxylO5YCXDtfCt/irhnZ5bLlXE/O6aG7NUAZqBH?=
 =?us-ascii?Q?6869111gD4zraX5kM/V48XcPmFY+mb6uwvvNvBVW3x0I7GWShjzfIQKcC2iD?=
 =?us-ascii?Q?s2oo4lNda8MSJlYi08GC58WM4V5TA7V2eFH6QtVke5TM5U50wsToy/1jF4qc?=
 =?us-ascii?Q?CJiTrRCXqVRX3LBYnqIIczBuCAQsXGmYtMt6peeOVUlSIuDyIJfcqTvQ7WSO?=
 =?us-ascii?Q?M/0wNcITs3W0VzmTIhcQ+XRidn6OvQI4/y+qPaZF+AFIM43YCTH8+rgPnCQy?=
 =?us-ascii?Q?TPED?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5e1d04d3-ca19-4e6b-f084-08dbc046b2ac
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 17:16:48.1849
 (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: Fe3dbssdI5rQS9i5BhIfWMX8xFGm3LdGkuDTu3Rn+kXW+/LN6EVKQtxM+DSJKV3iK/TPQCR8iKhkuHBjgtGmQg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5273
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-28_16,2023-09-28_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 mlxscore=0
 mlxlogscore=999 suspectscore=0 phishscore=0 adultscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000
 definitions=main-2309280150
X-Proofpoint-ORIG-GUID: NxYjELUyBFJZBWbmcnHtjFtkJLtbXpCP
X-Proofpoint-GUID: NxYjELUyBFJZBWbmcnHtjFtkJLtbXpCP
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 28 Sep 2023 10:17:42 -0700 (PDT)

When tracing through the code in vma_merge(), it was not completely
clear why the error return to a dup_anon_vma() call would not overwrite
a previous attempt to the same function.  This commit adds a comment
specifying why it is safe.

Suggested-by: Jann Horn <jannh@google.com>
Link: https://lore.kernel.org/linux-mm/CAG48ez3iDwFPR=Ed1BfrNuyUJPMK_=StjxhUsCkL6po1s7bONg@mail.gmail.com/
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/mmap.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mm/mmap.c b/mm/mmap.c
index 2f0ee489db8a..3c78afb707cf 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -937,6 +937,11 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm,
 			vma_start_write(curr);
 			remove = curr;
 			remove2 = next;
+			/*
+			 * Note that the dup_anon_vma below cannot overwrite err
+			 * since the first caller would do nothing unless next
+			 * has an anon_vma.
+			 */
 			if (!next->anon_vma)
 				err = dup_anon_vma(prev, curr, &anon_dup);
 		}
-- 
2.40.1