Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3024065ybt; Mon, 29 Jun 2020 13:11:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8WVhLH28IIaRti7amri63QeX4mbpb0bgvgEBsmPoFt8uboXR7uu6IAYEqOxlQlH1IMEmY X-Received: by 2002:a17:906:7ad7:: with SMTP id k23mr16008306ejo.439.1593461514754; Mon, 29 Jun 2020 13:11:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593461514; cv=none; d=google.com; s=arc-20160816; b=GcWjLSvcQsNabwfN9mOkmaO6jzhuuO9WWhYK1lutwOnMI03fV2y2oxfTcv2Af52MVl Eckef9y5heq6FFHDouyvcHM11GhwqNhIJocbIatsBBWMBoLwcb7b3dTRgAD3SASAdFaf OjYhDgIils+U/SHDUra3SDTCv4si8QIkWipJ/B+octkcMXUwtiDnsBuglxbLfcUM570M IgHVTBo5jDP6x8qIojBgAEl1oIbJcEvYBIak9s/I3ntlJ/Tir2Y40RRkRjrtyGfAm/TM uzI4iHOUkxw93eJr86z6mTaU67/+vVq6lrN4o+dthu9sdYc1f+/YwzkG04HUjvrc+CGA xEjg== 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=PZXVacCu0ZTHg2KP9A3d6IwJpIRQON4IquyHymiP5nU=; b=NpawLv/q5jZ9viaCp+x1kKwfDWAmatWuJeAyqIsjI4/Co7iiA1mnm8/RRzOiByiQq8 EVG9yNEY06xo9yHA+ihcCfNwCM1PEGD/YdrT0LhL3rEU2brhCaWdFGnyUuhqYMZyrb1R E6D+nVogB1WGaX+FsuX/xvWlzDEe2fqLSTqrQfm7CGvR9N9Mh8Df9DR8W780W/qfQ8m9 cZZSBIFHdp4G7wkPDWYHCaS/k6BYaBlQthfxnTHKZzpZQ2jeMXytzGzQsf8BX5TrUrDC /fA7GUsSMOyO6zVkcvwm4AZsETkGvLb/BBN/Idl6eaKeuFuCIcRrQaObUROm620ziLES cWeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xFm25tSs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id g22si324307edj.310.2020.06.29.13.11.32; Mon, 29 Jun 2020 13:11:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xFm25tSs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1728063AbgF2UK2 (ORCPT + 99 others); Mon, 29 Jun 2020 16:10:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:40596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732913AbgF2TaW (ORCPT ); Mon, 29 Jun 2020 15:30:22 -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 563BD2524F; Mon, 29 Jun 2020 15:36:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444964; bh=H+8j4J+pfTWSkqYdP+zN1ylFUFSYrabQRnCKMN7E/+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xFm25tSs0aSrilbTzBI227acSp8LamWF6Rndo4GAR5ctGEhAxRSeCDxgO4NUxvV6X +/hA3oRNgTtLFC4ILKNbBdibXULwFq8eqeC0znFX0I36ZLqq2q8S3S+2ttjy0+YSt3 HrI4Ye9GRyd9BiBq9DP8am0TgDl/mM90cwREascw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiushi Wu , Ard Biesheuvel , Sasha Levin Subject: [PATCH 4.19 063/131] efi/esrt: Fix reference count leak in esre_create_sysfs_entry. Date: Mon, 29 Jun 2020 11:33:54 -0400 Message-Id: <20200629153502.2494656-64-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153502.2494656-1-sashal@kernel.org> References: <20200629153502.2494656-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.131-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.19.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.19.131-rc1 X-KernelTest-Deadline: 2020-07-01T15:34+00:00 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: Qiushi Wu [ Upstream commit 4ddf4739be6e375116c375f0a68bf3893ffcee21 ] kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object. Previous commit "b8eb718348b8" fixed a similar problem. Fixes: 0bb549052d33 ("efi: Add esrt support") Signed-off-by: Qiushi Wu Link: https://lore.kernel.org/r/20200528183804.4497-1-wu000273@umn.edu Signed-off-by: Ard Biesheuvel Signed-off-by: Sasha Levin --- drivers/firmware/efi/esrt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c index 5d06bd247d073..2f6204b2fdd38 100644 --- a/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c @@ -180,7 +180,7 @@ static int esre_create_sysfs_entry(void *esre, int entry_num) rc = kobject_init_and_add(&entry->kobj, &esre1_ktype, NULL, "entry%d", entry_num); if (rc) { - kfree(entry); + kobject_put(&entry->kobj); return rc; } } -- 2.25.1