From patchwork Tue Feb 18 19:54:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 231127 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 74F29C34047 for ; Tue, 18 Feb 2020 20:04:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45C9721D56 for ; Tue, 18 Feb 2020 20:04:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582056271; bh=H4Ew2aAUupScSkFrN5Wkm/NovnKlteYwH0KQ/xlpASU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WZde9OJT/LLHOUcT6koc3awwhzsJq8XLjdDl/sgEVfxMCDJV7TOeGqlrK52wgYODX 5EXq0DzRDyyh7OVWUx3ne2LRmmIGciMMSeYRXEGWdrjh1w/xWcS8u5kLWky7ixdj9N foG7JMZbWShSwDyxN97d2Qc5EMR4/rZvTnqy7J7k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728484AbgBRUD1 (ORCPT ); Tue, 18 Feb 2020 15:03:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:44670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726539AbgBRUDZ (ORCPT ); Tue, 18 Feb 2020 15:03:25 -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 DA38824670; Tue, 18 Feb 2020 20:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582056205; bh=H4Ew2aAUupScSkFrN5Wkm/NovnKlteYwH0KQ/xlpASU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vXJPDhziwn0gcbF20foHroFI4jeoiK0gXgvrMj8558aGGiSHVCHHTaOef7jiHKyxe LXXihx1+bmN4Wr1R/DDIfcfHZKs0fvd6wqHBJGPi91vYJL2oJrC9SBJoUR83ykN6tf owrVIbcTzvQAH4mTavlI4R2YFRkmKzZQ9cjEbAJY= 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.5 38/80] s390/pkey: fix missing length of protected key on return Date: Tue, 18 Feb 2020 20:54:59 +0100 Message-Id: <20200218190436.045686429@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200218190432.043414522@linuxfoundation.org> References: <20200218190432.043414522@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -774,7 +774,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;