From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8935C1C07 for ; Wed, 28 Dec 2022 16:11:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3E20C433D2; Wed, 28 Dec 2022 16:11:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1672243880; bh=Fur5jFiopM4rsM8Gi92ftfD6oHd7siyojgCUBjlYClc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QZ7XCRdh5x0VCQPYBxwgOlxV3KACls9ATazPilluTz3SQMGGvAQ2u4+yggDHWL7SS y6ElRtQUuQYqQ9UZJ65PLau8CnOhdEiwwxv9Jtr+bp/Oj2IlozshxJtE3Xg0+i+Iag 53t4S71VndCDBwnGIZ8osIL9Y2kHgES1IYYv4uOI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Gaosheng Cui , John Johansen , Sasha Levin Subject: [PATCH 6.1 0571/1146] apparmor: fix a memleak in multi_transaction_new() Date: Wed, 28 Dec 2022 15:35:10 +0100 Message-Id: <20221228144345.683383782@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221228144330.180012208@linuxfoundation.org> References: <20221228144330.180012208@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Gaosheng Cui [ Upstream commit c73275cf6834787ca090317f1d20dbfa3b7f05aa ] In multi_transaction_new(), the variable t is not freed or passed out on the failure of copy_from_user(t->data, buf, size), which could lead to a memleak. Fix this bug by adding a put_multi_transaction(t) in the error path. Fixes: 1dea3b41e84c5 ("apparmor: speed up transactional queries") Signed-off-by: Gaosheng Cui Signed-off-by: John Johansen Signed-off-by: Sasha Levin --- security/apparmor/apparmorfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index d066ccc219e2..7160e7aa58b9 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -868,8 +868,10 @@ static struct multi_transaction *multi_transaction_new(struct file *file, if (!t) return ERR_PTR(-ENOMEM); kref_init(&t->count); - if (copy_from_user(t->data, buf, size)) + if (copy_from_user(t->data, buf, size)) { + put_multi_transaction(t); return ERR_PTR(-EFAULT); + } return t; } -- 2.35.1