Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2266426imm; Mon, 28 May 2018 05:05:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZosyvzA8A7X7oaZSSrFA9XkvPEMOalhblhrBt0kwDCOzbERd3ei1GrM4dN0pVyzHjm6wW65 X-Received: by 2002:a62:8b0a:: with SMTP id j10-v6mr13229893pfe.28.1527509105709; Mon, 28 May 2018 05:05:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527509105; cv=none; d=google.com; s=arc-20160816; b=cO57cHTZWl5SRRwj9NqoA2Tm2RGnCJMp6DiNInHeGFZZqvrLXGceNCStidIYS1DeML HdKnEqNOVY9PDpLWPLExsvkwLfMNuSJQRqBmTNT+20yQo5x81P1qRFnIuiwZjTgpG1yO wq7+gvKbkO1/gs6ott/DC2jVEpWIwimU9mKka8SGc4HJUR/p25pbNjPn5c7PFoh101+J 1Znyfv4ykv9si2UI2IRxPlK92e9UPuQMG2Df5niADuQUDlL9kfn5QzB0RZ7hkFflbl45 lrJ9u0e0bzp1KbSy9Q7kVm0y5x41GMeHirlTzHa9J7Dq8rf65KlEojwgi8lzsXrckUc6 8new== 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=4n5X+qDozURVjACkQORTwnkALG67jDJKRBH1G8LRT+E=; b=YqbN1rDIu56SF22TqPR3wMkIRn8pcxUw9ceviRGh2v60r0Uk/EgOcFoFAjZp3Dv3oB Z6kwdBLz+QQbqqTefErlkRH3dekNq8aLPZss7H+C6zVjyF6Qrz97PUGlqe1te+22Yt7/ 4gzzy1YbOG4F3xNNwufPbaXF3SiOGxwBqjECg/vd/Jg5dVopt53DEQRdgWkLYCNnbG/5 rm/2q6rg3lMXcwyzKD36VChUpbpwuc+voyWXdDjHY8OGqabaPFA1bsE1KAEJoIwLm+9P 5Z+wrf8KOAZxnH1O/RaYhY5UzBTsXhN9BWhSAYzDUCjkU0tO/TCHrzy1l0wjyuKEfn+7 vbuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=k2G21int; 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 b3-v6si29752007plc.14.2018.05.28.05.04.50; Mon, 28 May 2018 05:05:05 -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=k2G21int; 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 S1423289AbeE1LGg (ORCPT + 99 others); Mon, 28 May 2018 07:06:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:53326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423248AbeE1LG1 (ORCPT ); Mon, 28 May 2018 07:06:27 -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 6B9A92089E; Mon, 28 May 2018 11:06:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527505587; bh=pUrxVYh244WhCm6ZE41bVsYd/mg0G2lzod+kGf8Wo04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k2G21int0zp4NAb1lPibXKp9XF6vOmT54Rmz7Llf7yYjYE/cLHmdxN2ycmVdE3Y6K otRGgbVhgi0Ps1vF99yzvLm7nRzsCR4VHUhRDkNh/I+A1zDI2NxjifHCgKTVR57dP4 j/BEbGJq8C5RmicQQDZNfdSqkF5U0iUudl35RJtU= 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.16 058/272] z3fold: fix memory leak Date: Mon, 28 May 2018 12:01:31 +0200 Message-Id: <20180528100245.778235103@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100240.256525891@linuxfoundation.org> References: <20180528100240.256525891@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.16-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; }