From 216603afe2e8fe80458e8b5b58fab145a025675b Mon Sep 17 00:00:00 2001 From: Holger Dengler Date: Tue, 27 Dec 2011 11:27:20 +0100 Subject: [PATCH] --- yaml --- r: 280628 b: refs/heads/master c: 2389aef47efe32bd4ad2b7d47f157766d3680caa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/crypto/zcrypt_pcixcc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7ebbfa16614e..2295dc692d96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fe6f0970cf87dfd71452f5ec7ea54654acc9d6f +refs/heads/master: 2389aef47efe32bd4ad2b7d47f157766d3680caa diff --git a/trunk/drivers/s390/crypto/zcrypt_pcixcc.c b/trunk/drivers/s390/crypto/zcrypt_pcixcc.c index 646fb8f11512..077b7d109fde 100644 --- a/trunk/drivers/s390/crypto/zcrypt_pcixcc.c +++ b/trunk/drivers/s390/crypto/zcrypt_pcixcc.c @@ -260,7 +260,7 @@ static int ICACRT_msg_to_type6CRT_msgX(struct zcrypt_device *zdev, * @ap_msg: pointer to AP message * @xcRB: pointer to user input data * - * Returns 0 on success or -EFAULT. + * Returns 0 on success or -EFAULT, -EINVAL. */ struct type86_fmt2_msg { struct type86_hdr hdr; @@ -290,12 +290,12 @@ static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev, CEIL4(xcRB->request_control_blk_length) + xcRB->request_data_length; if (ap_msg->length > PCIXCC_MAX_XCRB_MESSAGE_SIZE) - return -EFAULT; + return -EINVAL; replylen = sizeof(struct type86_fmt2_msg) + CEIL4(xcRB->reply_control_blk_length) + xcRB->reply_data_length; if (replylen > PCIXCC_MAX_XCRB_MESSAGE_SIZE) - return -EFAULT; + return -EINVAL; /* prepare type6 header */ msg->hdr = static_type6_hdrX; @@ -314,7 +314,7 @@ static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev, return -EFAULT; if (msg->cprbx.cprb_len + sizeof(msg->hdr.function_code) > xcRB->request_control_blk_length) - return -EFAULT; + return -EINVAL; function_code = ((unsigned char *)&msg->cprbx) + msg->cprbx.cprb_len; memcpy(msg->hdr.function_code, function_code, sizeof(msg->hdr.function_code));