Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3233331ybj; Mon, 23 Sep 2019 17:33:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqyXvj22PndYqF9hWSDsGUDTjpa9eKhZyheqc4zC7qUGoVg/f2GObMr+UyOh0gSajrWF2J7p X-Received: by 2002:a17:906:564b:: with SMTP id v11mr164109ejr.225.1569285206843; Mon, 23 Sep 2019 17:33:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569285206; cv=none; d=google.com; s=arc-20160816; b=ah3P0FHQUl+IsnGxUv9vfImzuOU+9Je+6m1pMiiyHDRapyICTYY/ZD8xfXxI5PgoPg Ai/5U1PNGkZxMYjRDG6W+t+Badz3vLB5xLPiCZE30NuYvVe0STrb6jQ3iY8Dz2ArU3Df Hl5lTag2A/dvjLUee/PDVZ+oUlMUvPLGS1wFWBPw5nZQSm35mHOUSpEPZAcKesEr5CTM nYxSkyEEMzQxFT9QPt8U6jxvgrmhAADQeN1MbHfBpcnK3uZrXQ9xE8Sq9ux+EhLvofRj U6Ey5xIAMR804iILHIxyzxAEjkloK/NnpMw+1+8LilvQtPlx3ZhXsyR0zGV2BvWVRvjn qSNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SpWJh/x7gPXNetjZgS4yBz9Ra+il+eoeiI1gslcIK80=; b=KgFhUdG7i2KFqlICcduh92fK4+ToqVlEAW1J0j9Cl3vynYG4RMRlZndjGPmH7bxdia YJfufTlhgccqVHFEth5i3HA06uZvmaD+L2NStyvtolvE9dvYAd3HDv6HGkD9laPmUhCj HZIjFTy7yYom0BhiQZ/S0jniaL+9HThhCM4kQCjyf2zXl0bWxn95yRI0/fp7Io3VvtNe CilWj2DFvvSMhzEfHzW6xIflphFDCSsZ3SMK+E1eT45q0Vmv/3uO115zjRa5NMrSgDIN E0xvg2eonM9W4EmBKujOmlYc8uVtnbgjpUW0Ps3A2tjsc8J2+mwiylI1SCNlDOUNxRdj v7hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QkRy1uRa; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e25si83937edb.308.2019.09.23.17.32.43; Mon, 23 Sep 2019 17:33:26 -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=QkRy1uRa; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391581AbfIVSs0 (ORCPT + 99 others); Sun, 22 Sep 2019 14:48:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:44934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391457AbfIVSsM (ORCPT ); Sun, 22 Sep 2019 14:48:12 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 62CED214D9; Sun, 22 Sep 2019 18:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178092; bh=almqlEgrShZjlwAf+YmnkiSQmi+dQpvSMs4EOo+e5No=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QkRy1uRaR94eQnmAMR5IVLLqDYmcInUxGH0x03M2YeYtQm9PGEVuAaNIyweFtfVi0 ajGvoFtdhS2hHNcH82MoFx3JB1WBhjIFo16pCNwLfeP63QMZEHq9EuVCJ2foTqIYNP vfnWor40iwiM/k7E1QWKr2Ug5eKyUAVNSOeVb4xk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenwen Wang , "Rafael J . Wysocki" , Sasha Levin , linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 157/203] ACPI: custom_method: fix memory leaks Date: Sun, 22 Sep 2019 14:43:03 -0400 Message-Id: <20190922184350.30563-157-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wenwen Wang [ Upstream commit 03d1571d9513369c17e6848476763ebbd10ec2cb ] In cm_write(), 'buf' is allocated through kzalloc(). In the following execution, if an error occurs, 'buf' is not deallocated, leading to memory leaks. To fix this issue, free 'buf' before returning the error. Fixes: 526b4af47f44 ("ACPI: Split out custom_method functionality into an own driver") Signed-off-by: Wenwen Wang Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/custom_method.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c index b2ef4c2ec955d..fd66a736621cf 100644 --- a/drivers/acpi/custom_method.c +++ b/drivers/acpi/custom_method.c @@ -49,8 +49,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf, if ((*ppos > max_size) || (*ppos + count > max_size) || (*ppos + count < count) || - (count > uncopied_bytes)) + (count > uncopied_bytes)) { + kfree(buf); return -EINVAL; + } if (copy_from_user(buf + (*ppos), user_buf, count)) { kfree(buf); @@ -70,6 +72,7 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf, add_taint(TAINT_OVERRIDDEN_ACPI_TABLE, LOCKDEP_NOW_UNRELIABLE); } + kfree(buf); return count; } -- 2.20.1