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:     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 0/3] Fixes for vma_merge() error path
Date:   Thu, 28 Sep 2023 13:16:31 -0400
Message-Id: <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?4Tjlrh97fXfeZDl3dbqXq2+aejpmM/A6TwQ8CMa3VG56DyHVVoT6LTTBSkfq?=
 =?us-ascii?Q?OQWjn9FGLDhBSKDhK5R6Jdo+uXKH+L0goIezvdfnS+QQNNtJE4SrcEyT0wpS?=
 =?us-ascii?Q?5hBtG7KjKz9REYXNijiBRGJvSHtC/qoTft4MOEc5mpt7nk4CMTOsBg6Zl0MW?=
 =?us-ascii?Q?PhJlmcJ3HEWykGszSWdAtlcJa6cZNoIPUzfLgumCvUZhMltU3mF+oMG0STZz?=
 =?us-ascii?Q?ukKQ2IQkRlpoOD3OcmXaawChk6OH/+kjn3+7ja9qHiEuEpOcYUw2m8uezWTy?=
 =?us-ascii?Q?mIkHD1qPCeS3IoASs8UnBbI3yON8cHCUC8TNdB5K6m8jMJENxha2k1aVL1RU?=
 =?us-ascii?Q?vS/FWebJlugDRpkpHrDLxSwZ0T6RiHFmj9d/Lkxxz/ocw9Vp6XUf6S9YQ1Zl?=
 =?us-ascii?Q?v5hOTin6m+/JeHBAtDPoJebkRjDqMAjgfL64I16R5dwsAdn9hTgKPtxhcnDf?=
 =?us-ascii?Q?sCXtnl5fb1ZwX31f8WitILh3T9jzFP7AhMLfgJyAQ/MrqwCtTBqfmJstUjrs?=
 =?us-ascii?Q?7ec7xSwU9EVrZJUeD1xDYc9Kqfv53sYrTqPAzNv6tFm5SC+SQ8g++PE4epiC?=
 =?us-ascii?Q?QMYfxUUrZsl/GQyNYfdUfa5gP37YT8XWIPYkqMu00mjlDi5j2ON/w9ObmXSp?=
 =?us-ascii?Q?dHkZDBGOITQFIJkKQPzMWTYR4e4nYoWP5hbaF3LbitPR3XtgE+NFSngt9oyh?=
 =?us-ascii?Q?eri3B2KshZ9rwC1fsuqLrBeWF90e5XqvkozLM8AWoZDsfsuLNXNSFpGH7cPa?=
 =?us-ascii?Q?3z3nZAlro+mHrTeEcBiGZ3D0uZXTVuKwPXMeCF8iSxEaxVuknW8YVLX8DFku?=
 =?us-ascii?Q?6sa7/Rfh1cBAyKWpwxl0Y/SJOQB3K77ci5C7njGodpZ4JEK8qITWu/leOn/g?=
 =?us-ascii?Q?Qzo8ZMhwmo2UTwOjBW+dnkoXt7AKlew9Z87+VCgF3/xd1XA7Gw4RmFTWq18g?=
 =?us-ascii?Q?f50Z3NWsEi/+cRzDm1E5p0ZMB0lunurYtjc/7SwtVIvT/00Drhl9m3id16Sq?=
 =?us-ascii?Q?Q83Dsp8PZKbzxphyl3iDGFsxoIFXkkbhwcS0B1aDpobD+ceDc5d8GzsfIqk6?=
 =?us-ascii?Q?isjBNLDDYNAbocYtLj+iLwhv/M+UrfVdf9FiVMRhVOzLC7ujsWToQI07iGYd?=
 =?us-ascii?Q?cyeDNZTitJSIlAM6Y13jIymjXN4BK4ua1OTLXIeSNcUlQgWsxvOGxr9ED+eH?=
 =?us-ascii?Q?NiEBpaBJ+gXzS+SDFeZd0+xR7EkyAxhrcxB3fa8NgUCGpE7D+2DAcbxMbRD1?=
 =?us-ascii?Q?Uel7A83u4bVYT7mbhs768k0zSu0UEBS0FrJhCRoklA2BLYQPIn9P5zvF7R3b?=
 =?us-ascii?Q?zIKp3W4LusjLOJrcgTMxKvG2YDvU0rVM7N0JQDeBYIooCtVkSI0tnT/rKRDM?=
 =?us-ascii?Q?vwx/Lp5xgPvhZHa6g83ZNLg/bT0YrYNQIzzRhAgU9ASPBgEeRWNVtR7EAKDL?=
 =?us-ascii?Q?LoY4wbKWNEni9WJXwNEsXcsJxx4LTH21ntrbUBW3z22HBJQXkXwhAuTHbotP?=
 =?us-ascii?Q?5KXBxa/eA44cW3d2qtu9pnoe5UXGjPIUssBZ5p4iriRG7rtabkpReTXj00+W?=
 =?us-ascii?Q?mcbUeO3SDGo5VzAABag1wUVHoKOUjKxxwY+YzG5H?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?aZI33zM1wAXZae+Y8qolrMHJ9ik/KbJa2PkrmJKYteQerUyfQTSEGPBAF0/1?=
 =?us-ascii?Q?cTUBClEqvKjFfJQ2GTi+syi0g7ivHwdtEPTLHfz+IPtAXzCZTzGTE4ZePyo/?=
 =?us-ascii?Q?v3f9vOzVhMcTAMB0dv24PCSbR0A1Ir0dYyAOqDacGfsgoJz36061qFxqqt8l?=
 =?us-ascii?Q?vcAp1xWPJiLywAxpDhHe1Pez0OwkVnfhcgeSOsSFVbtdlNfwRyTRcxHg3PHq?=
 =?us-ascii?Q?/x6NoJLgQb4znAPV/LydKsYp/9i6sB5MewE3oKHlG5wupbrP/2p6F1jLmHXI?=
 =?us-ascii?Q?AVh+62/5HYx6Edz6mIzgUl4KVU/DQZFoJX0ZbqSEnR3UPOzaz7m5XLIk0/KY?=
 =?us-ascii?Q?4GmcE5ouwwGKftbjAd4tysF7QXOSWpTAjDqTxN0/gvkgpUA9ROjdvNsAin19?=
 =?us-ascii?Q?mnfoFA7NQKk9ogFVJqiZlMkuyyDZRom8GTyleeSVtUi8BQPcHiWjZOmppa8M?=
 =?us-ascii?Q?owTMPm6Fg4Kh+W9jzdJWJLErC5nlQrf+za8lpZFyb8lhcTDHh7C4skKtllzZ?=
 =?us-ascii?Q?WcVDxY5/F+2gfvzvhT7/bED34J89glBUKz2AkFVJwLELT6WsrcYa2Ih5aCUz?=
 =?us-ascii?Q?55vPD3pF7MRpBaqRuNMyMZL+DoXh2rStGSzHSoRtoN9npczUe5c1dg33O/VJ?=
 =?us-ascii?Q?nE7xG+IsBvRlWMgy/uo7KeZnf5ABTMqOIu5hZE+Rds7reveKFi+hKy+Ijmur?=
 =?us-ascii?Q?a3Sh1hgsM/pwbkaOENVpTSEpzBznIsCNGIY9dKbYXy5Umcpe4XdJmWqygYyV?=
 =?us-ascii?Q?Toz/fGncHHdkMxt+PkZr0TSewdoeJTCjsyF1C5F88k8j9LZy97TE7t8czYpU?=
 =?us-ascii?Q?cHkvHrlK19A+o3ZqIVaFzqV7dpxUmakeQGwSiPAybLi74ku9UDRx2JvY15p6?=
 =?us-ascii?Q?C8lVl0lKvBrBy9UHEhjJ5FNRbPStxakjoB2g+3oUnDl+qA/G+YnJq0ah3RBv?=
 =?us-ascii?Q?e6IBQL3MXuVcCBnIsuZ7uoLcR00CuLScHusO1YllVUK54qPgGl7g2ZvFXuhR?=
 =?us-ascii?Q?7wxH?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f17fec8f-08bf-4606-86f9-08dbc046ae40
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:40.7552
 (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: jOyakHA5CxGg5TjUcBeqvsP6FBbARqWXg4DT2NVW67lZZki1KuDmRLBDzmvCCobtmYyvCzfLEcMH9u4tyYsBnQ==
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 adultscore=0 spamscore=0 mlxscore=0
 malwarescore=0 suspectscore=0 bulkscore=0 mlxlogscore=550 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000
 definitions=main-2309280150
X-Proofpoint-ORIG-GUID: f2zBmCU_cijtLLXm_pTwn1yJvNESit2X
X-Proofpoint-GUID: f2zBmCU_cijtLLXm_pTwn1yJvNESit2X
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]); Thu, 28 Sep 2023 10:17:27 -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 v1:
 - Moved dup_anon_vma() call update from patch 1 to patch 2 - Thanks
   Matthew Wilcox
 - Changed comment on patch 1 - Thanks Andrew Morton

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 | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

-- 
2.40.1