From patchwork Tue Sep 29 11:01:53 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: 291094 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=-10.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 CE7BEC4741F for ; Tue, 29 Sep 2020 11:46:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87CB720848 for ; Tue, 29 Sep 2020 11:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379960; bh=/uNKJhrSgBRaXHUkDbsMqqZG9KXeyeqYdvIyFnEoUMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xAe4zNOiL6Fn2uYlEcyh3z3UnLJklISZg8r7h3z2sYWjzk1EdbSIlxzkhZvaWIo+e 2J8Aps2smX3hi9LvGwhiR52nNZPIMB5GuOnMQgC3k49udplR1u2RN/GYDNIZ4d9Ewc 1SyVjyW9L2jXsFMQ9sXT9Aj1jpaTPR4E1l8ZBy2o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730977AbgI2Lp7 (ORCPT ); Tue, 29 Sep 2020 07:45:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:46188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730787AbgI2Lp5 (ORCPT ); Tue, 29 Sep 2020 07:45:57 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 92853206F7; Tue, 29 Sep 2020 11:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379951; bh=/uNKJhrSgBRaXHUkDbsMqqZG9KXeyeqYdvIyFnEoUMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vWTN4WGHo2X0EMs1i8SifX/szEzmznCeiVgd7czyQ9qdoc75UuxCShtmal/BYb+zu O+RXJnj97uNUy1+8G+4JkGxT1gIaZyU3BqHqskfU0FkJWj/zCScFFEWds78SNWSuxH ubu001Pvfrt4zv6f0WkRnIi3SWGg0e1MwIM/gk6U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christian Borntraeger , Harald Freudenberger , Vasily Gorbik Subject: [PATCH 5.4 382/388] s390/zcrypt: Fix ZCRYPT_PERDEV_REQCNT ioctl Date: Tue, 29 Sep 2020 13:01:53 +0200 Message-Id: <20200929110028.956667035@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929110010.467764689@linuxfoundation.org> References: <20200929110010.467764689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christian Borntraeger commit f7e80983f0cf470bb82036e73bff4d5a7daf8fc2 upstream. reqcnt is an u32 pointer but we do copy sizeof(reqcnt) which is the size of the pointer. This means we only copy 8 byte. Let us copy the full monty. Signed-off-by: Christian Borntraeger Cc: Harald Freudenberger Cc: stable@vger.kernel.org Fixes: af4a72276d49 ("s390/zcrypt: Support up to 256 crypto adapters.") Reviewed-by: Harald Freudenberger Signed-off-by: Vasily Gorbik Signed-off-by: Greg Kroah-Hartman --- drivers/s390/crypto/zcrypt_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/s390/crypto/zcrypt_api.c +++ b/drivers/s390/crypto/zcrypt_api.c @@ -1419,7 +1419,8 @@ static long zcrypt_unlocked_ioctl(struct if (!reqcnt) return -ENOMEM; zcrypt_perdev_reqcnt(reqcnt, AP_DEVICES); - if (copy_to_user((int __user *) arg, reqcnt, sizeof(reqcnt))) + if (copy_to_user((int __user *) arg, reqcnt, + sizeof(u32) * AP_DEVICES)) rc = -EFAULT; kfree(reqcnt); return rc;