From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D1E3C2D0DB for ; Fri, 24 Jan 2020 09:39:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3C5820709 for ; Fri, 24 Jan 2020 09:39:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858796; bh=oWb8Ya0sm0pvKPDxvhDcXDKyiSM/2jidzOVXJWnMCrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Az4CDqdvozWBiUOp5r3XBvKsy//z+Ws/kOcODD9727ahHB5Y6Ac9kCiRFqr5Qq9e8 JViWB3elEePkt/tDk75HdXKCT0qMUpzaLwP3M82fmSv3VpUBynfwux6Yv3WSEFRCkH qsqZae9yOYTvh14sZ9WQp9xqCjfHW5nKgnCgZyLE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731688AbgAXJja (ORCPT ); Fri, 24 Jan 2020 04:39:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:36638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731650AbgAXJja (ORCPT ); Fri, 24 Jan 2020 04:39:30 -0500 Received: from localhost (unknown [145.15.244.15]) (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 857A72070A; Fri, 24 Jan 2020 09:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858770; bh=oWb8Ya0sm0pvKPDxvhDcXDKyiSM/2jidzOVXJWnMCrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r4QUoCoo8Vurhwx9ZrOdD1tdl/isvWdKqRdQPzoG/5M/T9SLOqoGvRS0WpDTNLYuH ANCwC3Svp3qWdAgt9ssbB5J7ERZB6+QWxHLo6B1w4sAQ/+3FGF0WHf+MiCw36UaYM3 NoMNsFxDEU1KGbb5PQE04gu9UJtJ4W8uL37gb5sI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Markus Elfring , Christian Borntraeger , Heiko Carstens , Vasily Gorbik Subject: [PATCH 5.4 035/102] s390/pkey: fix memory leak within _copy_apqns_from_user() Date: Fri, 24 Jan 2020 10:30:36 +0100 Message-Id: <20200124092811.559543225@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092806.004582306@linuxfoundation.org> References: <20200124092806.004582306@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Heiko Carstens commit f9cac4fd8878929c6ebff0bd272317905d77c38a upstream. Fixes: f2bbc96e7cfad ("s390/pkey: add CCA AES cipher key support") Reported-by: Markus Elfring Reported-by: Christian Borntraeger Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik Signed-off-by: Greg Kroah-Hartman --- drivers/s390/crypto/pkey_api.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/s390/crypto/pkey_api.c +++ b/drivers/s390/crypto/pkey_api.c @@ -740,8 +740,10 @@ static void *_copy_apqns_from_user(void kapqns = kmalloc(nbytes, GFP_KERNEL); if (!kapqns) return ERR_PTR(-ENOMEM); - if (copy_from_user(kapqns, uapqns, nbytes)) + if (copy_from_user(kapqns, uapqns, nbytes)) { + kfree(kapqns); return ERR_PTR(-EFAULT); + } } return kapqns;