Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2311094imm; Mon, 28 May 2018 05:53:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJzFz//QLJvYGYWxEzTFUQDOkCV6M7L9aDQk8iNqjcGL5Fl1ey6HrF5D/ke4/yy8fYexnVh X-Received: by 2002:a65:66c6:: with SMTP id c6-v6mr6742021pgw.76.1527511980588; Mon, 28 May 2018 05:53:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527511980; cv=none; d=google.com; s=arc-20160816; b=JsDjh/ryXEOA2x+0qA4EGpF/XuJ5pOA+KFP/m6RoUkgKCIJgQGYoRzSuMe9WchgovS 73wzA0m34pwEcGMnbMfnyqEJRG5tEegXtpemsIgjFBf4HyFmRXb5O5O/UTBbAfCC+/08 k4qvar85bfNbWSzc7EuU9ZpIRxrsuKo5XmH+xHlpfZvoLZJnHbHHt02xRRcbjGLR0Uur 3UGMYEGuDXyw6Sb5iRSkizfzez1NeUSOeO4Jn3049SdelllS2tY7zwX4UoPN/4zRBaS4 imSHd8FNIyyyI+bIlUznJCP9zk09G+b96PldliEXGzNfstdZswbCXpf9EfL2jPxfAAaH ekgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=VB3ycKtqZy+HF/8G08KidXZRI7+la8F6nguzRQNIClo=; b=vyXNLjhKc3DO4uJcULlQN6+dS87ZNW+q7/NMEn5Z4fdAOXZyg2O+wZeItV7LEePRrk laNznegWR7VQ829diZ0EDt+sTqCUH2/ACGZJGIJE9I5yXoS0882XSo7wBh886r4tIvx3 +7JqDgsk75geYygS59HTBWSkYLjmRbGdg3N72auL3QYDFoJSGEelv2DFXd/K1nfZAE3z Zha3FyJ0na3mIa/YtEeV1OolTZ/7UuDWDoh0wjd3mcdtXGYgE3GFNePAUS8VW5gfDXjU ywoslJZpVOAzQ42ghSvOn6GZIHO9OShUhjW3LrrJhHwL/t4faGs74mPa9bFvb5R8/ATn 0pUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nihWGtMP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r28-v6si3441906pfe.168.2018.05.28.05.52.45; Mon, 28 May 2018 05:53:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nihWGtMP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1164580AbeE1Mva (ORCPT + 99 others); Mon, 28 May 2018 08:51:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:44522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164467AbeE1K4C (ORCPT ); Mon, 28 May 2018 06:56:02 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E9196208A2; Mon, 28 May 2018 10:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527504962; bh=3nFHAjbVn7W2X3mjPLme6V6UFwfWyBE3d/TvDvbYAME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nihWGtMPpFcLvWaBGl84RsHGMI6FHf30wT95CV/y2uvB4E04cCig7p5ZTO9+UTN9/ HcwkWhYsi3ppsnnRHhzAjPRmH65HPfzOufDLvS6yxHj3QsPCUOFDl9mssM5qSZjscD neAi/q77Chs68wido+wvj5pO6ULw+e7T6mpcpWzc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xidong Wang , Andrew Morton , Vitaly Wool , Mike Rapoport , Linus Torvalds , Sasha Levin Subject: [PATCH 4.14 326/496] z3fold: fix memory leak Date: Mon, 28 May 2018 12:01:51 +0200 Message-Id: <20180528100333.567291601@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100319.498712256@linuxfoundation.org> References: <20180528100319.498712256@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xidong Wang [ Upstream commit 1ec6995d1290bfb87cc3a51f0836c889e857cef9 ] In z3fold_create_pool(), the memory allocated by __alloc_percpu() is not released on the error path that pool->compact_wq , which holds the return value of create_singlethread_workqueue(), is NULL. This will result in a memory leak bug. [akpm@linux-foundation.org: fix oops on kzalloc() failure, check __alloc_percpu() retval] Link: http://lkml.kernel.org/r/1522803111-29209-1-git-send-email-wangxidong_97@163.com Signed-off-by: Xidong Wang Reviewed-by: Andrew Morton Cc: Vitaly Wool Cc: Mike Rapoport Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- mm/z3fold.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -469,6 +469,8 @@ static struct z3fold_pool *z3fold_create spin_lock_init(&pool->lock); spin_lock_init(&pool->stale_lock); pool->unbuddied = __alloc_percpu(sizeof(struct list_head)*NCHUNKS, 2); + if (!pool->unbuddied) + goto out_pool; for_each_possible_cpu(cpu) { struct list_head *unbuddied = per_cpu_ptr(pool->unbuddied, cpu); @@ -481,7 +483,7 @@ static struct z3fold_pool *z3fold_create pool->name = name; pool->compact_wq = create_singlethread_workqueue(pool->name); if (!pool->compact_wq) - goto out; + goto out_unbuddied; pool->release_wq = create_singlethread_workqueue(pool->name); if (!pool->release_wq) goto out_wq; @@ -491,8 +493,11 @@ static struct z3fold_pool *z3fold_create out_wq: destroy_workqueue(pool->compact_wq); -out: +out_unbuddied: + free_percpu(pool->unbuddied); +out_pool: kfree(pool); +out: return NULL; }