Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
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 3/3] mmap: Add clarifying comment to vma_merge() code
Date:   Fri, 29 Sep 2023 14:30:41 -0400
Message-Id: <20230929183041.2835469-4-Liam.Howlett@oracle.com>
In-Reply-To: <20230929183041.2835469-1-Liam.Howlett@oracle.com>
References: <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?QCMbe91uvGZ6VIcPH/JNVWUmQdpwjLFl57rFdUvU5vVuaUPlm26fuehWM2Ux?=
 =?us-ascii?Q?+M4cQiaecBqBEKHgPd3+8DgZoziTzaEyIB1D1n2FS2GnwjIcpYP/VkRGgv3l?=
 =?us-ascii?Q?dV1E9aiRsL23OU/I+MNMYK4zRoBX425bUgs6Vvtw0wNt1wX3MppY9XSEWYEw?=
 =?us-ascii?Q?IfL38iUh+4Bi5Z7nrUNXgGkMOvCuDz3zoUwP5THAmOFdW6m4q25f8qxL73QU?=
 =?us-ascii?Q?jrUKZQ6hLRSvOn24vX5jEJ6r4s/9XLba2bzEL76oUPUvcv4/nSh5otz412gF?=
 =?us-ascii?Q?W5xSZdHhpJVYs9+vknjfcV1IBbWya5G61Quk/lUGWqSJQ9ha9Wvnk72O99H4?=
 =?us-ascii?Q?hD/ejgtbtXgYZnMGrPH6Zm0Km9PrIDTxQtY5erBRr37oWWDkQ5jb7cczRZAJ?=
 =?us-ascii?Q?o33AsWDFlqWlOJJGM0ApjhjasQTNhz76SrbEW9tOdk6s0N+mSCTdhozPalaZ?=
 =?us-ascii?Q?hW5kjAQXui2vssKakQkEsQ/ztIBxIWZge/W/+8pw4XC8dO8Zv3h2dfRVi31T?=
 =?us-ascii?Q?TCEKFBmI9x+A7wc4W5dL6sDveZv0E4ayU1VrnR8z0gTXYqfs1ca/CFmo9HIa?=
 =?us-ascii?Q?6UOy9zQ244TkLIIXLLT2ox5+3ugUGfaSXd73c5LcLqC3OkIOyJcXKcOI9ER1?=
 =?us-ascii?Q?PW6TTTAqvUBrnS5209G8LGjiv3hy73WA8v1ajxmZcC4vZeTwL/7XpcR7yZY5?=
 =?us-ascii?Q?hZGhQEdWvPcIT3SA/9aYlJ0KNwO4XijCXiHFqiZT20U4aeNc9Eog9rT9/Qc6?=
 =?us-ascii?Q?nzWC6JSUUXsaGIXW6K9hKvZyZKL1VLqnEN238Sk9O1n9Nj0Dbeh6uPJTzDVA?=
 =?us-ascii?Q?EMT9p6UCLwR5US6Q5xe/8iplWvC7XAvV8GnxWbdMQ3MRjQGPvbWo33j4gYnv?=
 =?us-ascii?Q?c6vG3Egta/mM0+KJ/8Vo1lCkNHAk7zpEx4qgYVj9oQDEAs1ypq9VAtfYMIXk?=
 =?us-ascii?Q?+OvmfEM2zcIhfhneYCYcCzULT/ai/AdsKCLI40b/0oB/ORhRhXAEzBAnQpw1?=
 =?us-ascii?Q?cEeSY7I40JZKSaca1ayaaruV7nM9rh/OihtwhDakBfeNn4Y+ykrmqcF5943D?=
 =?us-ascii?Q?n6mvYwfDmZderJFlZ9aOpNqRnnn7qTl+1EO3E3qVfb/uldr9sIWP1u0hmWOp?=
 =?us-ascii?Q?bpKtxVE+3RBBu8k8PcStUEmj1E7wzFIvHNMb6MNUn4kY/V2o5BlOlqrPN0Yy?=
 =?us-ascii?Q?RySppoluDxECLor9Zl+3sxZaFvXskPW999GEzTYls7S9++P8/97pCKdOP+Od?=
 =?us-ascii?Q?8lYG74WnHOgj4YQDoYsHRV97Xft3QTR5F2B3ya8Z+hX6RXnDCrfJrY7TtwAO?=
 =?us-ascii?Q?CKP6xP2cR4R+yF1aalnPgWk9XuggX88mcipqNxSr5dHanqjQJze/Xtj4X+Kp?=
 =?us-ascii?Q?yt+QpY8Y8bJ94ViPuab6Me4+nI4FVan4oxOhsMBtdyI7nUmtVfzQFCBmaaBS?=
 =?us-ascii?Q?MJr0STiWPKzMwzvWFpYm4PMTCD3uGYcnDZ3eHxalRCpL0Qk/W8GXN27Alzbn?=
 =?us-ascii?Q?x3rJ4WZYZJnwNrWDNkae5ru27QDR38sV6qM9OIfZO1L0r0r7Y8DyTujYY1Tp?=
 =?us-ascii?Q?xFsHbhORV6SDJRo/mUOga9SUH//TEvZkqN2HofIw?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?WGHm2YKBV1X+loiI8abPoVnlspK9xDfjFBtIZeR+xNkleWmn/UOu8TkO1Xkq?=
 =?us-ascii?Q?pJG/9IRWtLdN+0R/jlKiaYp0NQO18iqb9MsT9w2NzDzMJw5fybAA2nfZg7yO?=
 =?us-ascii?Q?E1MsVASeXlmfoJTcU0P7jbCswMt2qteE6S3R8sJZDJI4A1q3O/JD3qwZltlQ?=
 =?us-ascii?Q?Vtcys8fTWf6d22oAQG28UXODMoseexgD7QoORfUv20CrCzziod8VkIaGaJVq?=
 =?us-ascii?Q?ORGnrywx/d0beIM/RX0MSBWugs4UHLKBF3kPL9PFujV4ZR4S9Xx4ecpkLKgh?=
 =?us-ascii?Q?IYwiQC8x8gQSwTsWhvxY5lXy3yaH22/E8gfUf/pbozkjz/3ZFF/OP9XSuwlG?=
 =?us-ascii?Q?lgl+/MKrinWe7c3tRYvemh/c+ovo0Q5euPnnYYIxKHYTscefmmiRQ9h2gfuI?=
 =?us-ascii?Q?SC+Q56PT/tjdt4hEhhqu5Fkr99p4KjkSU8nHArgnFreCSbYSQXs2wSsaEYDn?=
 =?us-ascii?Q?h0Rs8YcakGacpKlVBEsIqisVRWukVqtoJyeANTKLBxM/6Ki16tMv3AOTQ/oD?=
 =?us-ascii?Q?YkniEc6FClEbYP0ITDERDhAfHvMBVDddGcbfYSfXfgyLhpVtgrCj4NVa/Rbu?=
 =?us-ascii?Q?c2cTakTrPnTa5bLDBrzYQJWWFswdbtunYRYjpjDutNuWcS5Q14Hi1vCprL+p?=
 =?us-ascii?Q?GuKMgBL9LCrJ69muFDnzk4ISBzRBRE587yCMXV0Zw2IYBv0AnoQfB28Hb3RP?=
 =?us-ascii?Q?hgOllFo8CWpvbV6XTnbf4wik+xSHvo0C/HlG+sYHAtp8oelm4E7ArsAeHIUY?=
 =?us-ascii?Q?Au2EN7Bo4OJFojGDXnTbBeUcPLONAfrfWW/Vs4VdFQGC3/xP8b4w46WvcAum?=
 =?us-ascii?Q?Pk0z676eLnM8AZEzqlhrRAQUX0GO87SyBS4bHBioc1a9FQK5y7rl4K7su3OH?=
 =?us-ascii?Q?hJ9pnnichkGYHSFr9k/OwSgo6VFiNXwreTHAhccYaJNw5A00wkV/iD5t02Zp?=
 =?us-ascii?Q?3Iw2UgAjqb6JDtRuu/SyoA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8a4db761-7c3a-4a21-a5c8-08dbc11a378d
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:54.9544
 (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: ujGEhjsRzfrA3VhUzmqXLT9VdcFe3zQqMohGuxEet5ovlsW3+FY8hFHPLaRlydMHxpxE1XU1tpYex/lDCsJMFw==
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 adultscore=0 phishscore=0 mlxscore=0
 spamscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000
 definitions=main-2309290160
X-Proofpoint-GUID: T2udX_rXcYI9ZNWQXCW4brP5RmhRsUfJ
X-Proofpoint-ORIG-GUID: T2udX_rXcYI9ZNWQXCW4brP5RmhRsUfJ
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_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 (howler.vger.email [0.0.0.0]); Fri, 29 Sep 2023 11:31:51 -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 f9f0a5fe4db4..9967acbd070f 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -943,6 +943,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