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 794D1C34026 for ; Tue, 18 Feb 2020 20:07:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4754B2067D for ; Tue, 18 Feb 2020 20:07:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582056475; bh=CzlmSGaA+mX1PY2yfsgk4tX4jQQvo9lrCAaFtqbHJfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zCeUx8m0djkJnpF6zO+vjK8/kouGm0Zg3KUnyFzBCSqAztMnzoMqVqcjzyQMLI6iG +WedrDbqMLFx5tHOOOkFKOMZyV9I00+304Gmpf+q+rVTuELVMgct+yCX6u9HFrdjkX MYZT/fXMokAGewBoqNryWz1CqVJJdvsrHMdX/reo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728249AbgBRUHx (ORCPT ); Tue, 18 Feb 2020 15:07:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:36574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727666AbgBRT6n (ORCPT ); Tue, 18 Feb 2020 14:58:43 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 2B13620659; Tue, 18 Feb 2020 19:58:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582055922; bh=CzlmSGaA+mX1PY2yfsgk4tX4jQQvo9lrCAaFtqbHJfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RbaZLUmplanotqf45snaMafrFHMi5Q6aH3aWRYfywWflI3zGBIDZLu/K56BlEIGEC m6VEQc8m51bv1l7PYrjZN6z1OY/0NTvHuNWi+XmsosrKMppRksZCV9B0XrufsR6ERM mDVdyV03BrbPGRL9sNw64HbcPJPSwCHOLu5SSZGw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harald Freudenberger , Christian Rund , Ingo Franzki , Vasily Gorbik Subject: [PATCH 5.4 32/66] s390/pkey: fix missing length of protected key on return Date: Tue, 18 Feb 2020 20:54:59 +0100 Message-Id: <20200218190431.033107790@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200218190428.035153861@linuxfoundation.org> References: <20200218190428.035153861@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Harald Freudenberger commit aab73d278d49c718b722ff5052e16c9cddf144d4 upstream. The pkey ioctl call PKEY_SEC2PROTK updates a struct pkey_protkey on return. The protected key is stored in, the protected key type is stored in but the len information was not updated. This patch now fixes this and so the len field gets an update to refrect the actual size of the protected key value returned. Fixes: efc598e6c8a9 ("s390/zcrypt: move cca misc functions to new code file") Cc: Stable Signed-off-by: Harald Freudenberger Reported-by: Christian Rund Suggested-by: Ingo Franzki Signed-off-by: Vasily Gorbik Signed-off-by: Greg Kroah-Hartman --- drivers/s390/crypto/pkey_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/s390/crypto/pkey_api.c +++ b/drivers/s390/crypto/pkey_api.c @@ -794,7 +794,7 @@ static long pkey_unlocked_ioctl(struct f return -EFAULT; rc = cca_sec2protkey(ksp.cardnr, ksp.domain, ksp.seckey.seckey, ksp.protkey.protkey, - NULL, &ksp.protkey.type); + &ksp.protkey.len, &ksp.protkey.type); DEBUG_DBG("%s cca_sec2protkey()=%d\n", __func__, rc); if (rc) break;