From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADEA1C433EF for ; Wed, 13 Jul 2022 16:39:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD15D940150; Wed, 13 Jul 2022 12:39:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D8114940134; Wed, 13 Jul 2022 12:39:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C70C4940150; Wed, 13 Jul 2022 12:39:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B7F70940134 for ; Wed, 13 Jul 2022 12:39:33 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id BE5211204FC for ; Wed, 13 Jul 2022 16:39:32 +0000 (UTC) X-FDA: 79682637384.14.1C3EEC3 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by imf06.hostedemail.com (Postfix) with ESMTP id 621DC180031 for ; Wed, 13 Jul 2022 16:39:32 +0000 (UTC) Received: by mail-pg1-f178.google.com with SMTP id f65so1693651pgc.12 for ; Wed, 13 Jul 2022 09:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ma77Mvvn5WCi7OoVCzQsf7qhxKePUdI/Bw8DTgElBPw=; b=dYFmTfA7Vht3EefVm6hz8JJ2mPp5TilswGfxMA9F81Dq9oMeqo6s05ElZzeGVx1TiY KryobChKkROmJPgr5PuVYTGhmpZepfhMgG0X2be1AaQ3MWzi19v/sGEG6HaJGZEYUKx4 zqdnF4SSkM+lCO+ISj7ue39xX1ZBd2KpqHKjgoSzUW7qr/RNyOj9kkjiXOcj89IpCDNv PX5D08K9piuhozPdHbd3bMVVhtCMhKo4MzwLJaSQ3XhwGP8NeBol56JfCLemwTsOvx1A LZHOcjN82r7+1OftFgXjsSio4LFsg3cyA72Zpy8NxkPDG3+debmeK4QmF+MAeT5INQ1t cPdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ma77Mvvn5WCi7OoVCzQsf7qhxKePUdI/Bw8DTgElBPw=; b=kXGlrgcrdT8OnpGrthhvIWvISbi/JCMPIPxcO9uauX8Kb8T8p2o2vkvww63QXkqM7J 64RQeDAfClsgyivB3FMXHJ/adTWAdOzJUzTaXZRBvXt9gNpvrlCyHOO/Qxr9KnF17Qhy NySFtMeibmeCYkrjOD8iuMqdjtUYdIxAgBWK51k1ByokasYTw0t6k0uKItLfDliUI2O7 MPhUJQc0BOsojIJYDcSZKwf2pXqikzg/O6zG2Mbkx+RgZ9vS9GCop+sG/wzmMFgTlx3M JLmdqV4cMP5cmklI+6kj432cIhG4SKFCxb+ENxKJv+VERs+wda296F9EeRjO3JXZ3YQH CFWw== X-Gm-Message-State: AJIora9lR65/kadCpGYXleFqX+eToS953jUskxiIWHbe0eWYInP50HZ4 2gT1W/YDUHajRn2/ocGJ1OY6vQ== X-Google-Smtp-Source: AGRyM1vIBuaA9rk+Ok0vODvSS5OGBaYbjHWm7s5P4R06wKNiz80eCF1FM7hE6S6UMjjvlpIa86nycQ== X-Received: by 2002:a62:542:0:b0:525:a313:fe28 with SMTP id 63-20020a620542000000b00525a313fe28mr3866498pff.73.1657730371126; Wed, 13 Jul 2022 09:39:31 -0700 (PDT) Received: from google.com (55.212.185.35.bc.googleusercontent.com. [35.185.212.55]) by smtp.gmail.com with ESMTPSA id f6-20020a62db06000000b005255f5d8f9fsm9025582pfg.112.2022.07.13.09.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 09:39:30 -0700 (PDT) Date: Wed, 13 Jul 2022 09:39:27 -0700 From: Zach O'Keefe To: Souptick Joarder Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel test robot , Dan Carpenter Subject: Re: [PATCH] mm/khugepaged: Avoid possible memory leak in failure path Message-ID: References: <20220713024109.62810-1-jrdr.linux@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220713024109.62810-1-jrdr.linux@gmail.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657730372; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ma77Mvvn5WCi7OoVCzQsf7qhxKePUdI/Bw8DTgElBPw=; b=8LGzFtnnpHIAYa+ZUy2LSuk9FiM912UeMsUXyTU02Qfj1d410OnD0sc+Sn+ami640Knc9G NLya1akAOElfVng7+EBr09rLq5DPKmoL7h2CnRIsB7KAhAasAosiZQDBLZcaG1d8GG2OUN 59F7L21cUeRLj1A5/arr5fcNx2+TKQo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657730372; a=rsa-sha256; cv=none; b=1a+RAo5fAo5f4a65CFJPeWgRMq/xXd3MtuUqhiy05sd75G+lqshS6GP2EZy0OaQ1t8Z8kK gVTJdJxliEkAZ3918VSDYHndpN2jMjyzAsV/2cD2EvBmD3jEMpmgrlyku756nh7lg3MnxZ b05bstC2D77dhlwskwEKGk4f67yjwsY= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=dYFmTfA7; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of zokeefe@google.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=zokeefe@google.com X-Stat-Signature: 5o5nrrfiisszy1pthjecitzemgbcerhs X-Rspamd-Queue-Id: 621DC180031 X-Rspam-User: Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=dYFmTfA7; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of zokeefe@google.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=zokeefe@google.com X-Rspamd-Server: rspam05 X-HE-Tag: 1657730372-215936 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Jul 13 08:11, Souptick Joarder wrote: > From: "Souptick Joarder (HPE)" > > smatch warnings: > mm/khugepaged.c:2409 madvise_collapse() warn: possible memory > leak of 'cc' > > Avoiding possible memory leak. > > Reported-by: kernel test robot > Reported-by: Dan Carpenter > Signed-off-by: Souptick Joarder (HPE) > --- > mm/khugepaged.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 0207fc0a5b2a..8da9e7467543 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -2397,12 +2397,6 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, > BUG_ON(vma->vm_start > start); > BUG_ON(vma->vm_end < end); > > - cc = kmalloc(sizeof(*cc), GFP_KERNEL); > - if (!cc) > - return -ENOMEM; > - cc->is_khugepaged = false; > - cc->last_target_node = NUMA_NO_NODE; > - > *prev = vma; > > /* TODO: Support file/shmem */ > @@ -2415,6 +2409,12 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, > if (!hugepage_vma_check(vma, vma->vm_flags, false, false, false)) > return -EINVAL; > > + cc = kmalloc(sizeof(*cc), GFP_KERNEL); > + if (!cc) > + return -ENOMEM; > + cc->is_khugepaged = false; > + cc->last_target_node = NUMA_NO_NODE; > + > mmgrab(mm); > lru_add_drain_all(); > > -- > 2.25.1 > > Thanks for the fix! I've also sent out another patch on top which addresses the actual missing kfree()