Improve zcrypt reply message verification checks
Subsystems (2)
Harald Freudenberger
maintainerv6 cover Improve zcrypt reply message verification checks
Add or improve checks related to buffer sizes and reply sizes to the handling of replies from the crypto cards for CCA, EP11 (AP message type 6) and ICA (AP type 50) messages. The verification code related to reply field length was not designed well and thus firmware deficiencies could lead to unexpected behavior in the zcrypt device driver. Thus improve the code to more closely inspect especially length fields at message replies.
Rework zcrypt_msgtype6_receive(), zcrypt_msgtype6_receive_ep11() and zcrypt_msgtype50_receive() to validate reply lengths more carefully before copying data back into the request buffer. Use size_t for length calculations, reject inconsistent reply sizes, and add defensive handling for short invalid replies. For XCRB replies, validate both reply segments and derive the effective message length from the covered range instead of trusting only the second segment.
Changelog:
v1 - initial patch
v2 - fixed typo in header check_for_overflow -> check_add_overflow. v3 - rephrased and smoothed subject and text of the patch. It is now
"s390/zcrypt: Improve zcrypt reply message verification checks" and the text does not talk about malicious cards any more. Updated Reviewed-by tags
v4 - As sashiko clearly states the addition of two 32 bit values can
mathematically never overflow a 64 bit value and thus the check_add_overflow() was total overkill - removed.
v5 - Sashiko had a by-catch related to the very same fields. Under
some circumstances the fields count1 and offset1 of the CPRB where not checked but used for a memcpy to userspace. So again a rework of the check of these x86 header fields in the receiving function before the CPRB is processed to be copied in parts to userspace. Removed all reviewed-by as I want to have another developer look onto this patch again.
v6 - Again reworked and re-structured the code. As the very same
pattern appears with message type 50 also reworked the receive function there.
Harald Freudenberger (1):
s390/zcrypt: Improve zcrypt reply message verification checks
drivers/s390/crypto/zcrypt_msgtype50.c | 39 ++++--- drivers/s390/crypto/zcrypt_msgtype6.c | 151 ++++++++++++++++--------- 2 files changed, 126 insertions(+), 64 deletions(-)
Signature · 1 line
2.43.0
Harald Freudenberger
maintainerPATCH v6 1/1 s390/zcrypt: Improve zcrypt reply message verification checks
Add or improve checks related to buffer sizes and reply sizes to the handling of replies from the crypto cards for CCA, EP11 (AP message type 6) and ICA (AP type 50) messages. The verification code related to reply field length was not designed well and thus firmware deficiencies could lead to unexpected behavior in the zcrypt device driver. Thus improve the code to more closely inspect especially length fields at message replies.
Rework zcrypt_msgtype6_receive(), zcrypt_msgtype6_receive_ep11() and zcrypt_msgtype50_receive() to validate reply lengths more carefully before copying data back into the request buffer. Use size_t for length calculations, reject inconsistent reply sizes, and add defensive handling for short invalid replies. For XCRB replies, validate both reply segments and derive the effective message length from the covered range instead of trusting only the second segment.
--- drivers/s390/crypto/zcrypt_msgtype50.c | 39 ++++--- drivers/s390/crypto/zcrypt_msgtype6.c | 151 ++++++++++++++++--------- 2 files changed, 126 insertions(+), 64 deletions(-)
drivers/s390/crypto/zcrypt_msgtype50.c +26 -13
@@ -416,26 +416,39 @@ static void zcrypt_msgtype50_receive(struct ap_queue *aq, .reply_code = REP82_ERROR_MACHINE_FAILURE, };struct type80_hdr *t80h; -int len; +size_t len;/* Copy the reply message to the request message buffer. */ if (!reply) goto out;/* ap_msg->rc indicates the error */ + t80h = reply->msg; -if (t80h->type ==TYPE80_RSP_CODE ) { - len = t80h->len; -if (len > reply->bufsize || len > msg->bufsize || - len != reply->len) { -pr_debug ("len mismatch => EMSGSIZE\n" ); - msg->rc = -EMSGSIZE ; - goto out; - } -memcpy (msg->msg, reply->msg, len); - msg->len = len; - }else { -memcpy (msg->msg, reply->msg,sizeof (error_reply)); + +if (t80h->type !=TYPE80_RSP_CODE ) { +if (reply->len <sizeof (error_reply)) +memcpy (msg->msg, &error_reply,sizeof (error_reply)); +else +memcpy (msg->msg, reply->msg,sizeof (error_reply)); msg->len =sizeof (error_reply); + goto out; + } + + len = t80h->len; +if (len != reply->len) { +pr_warn_ratelimited ("len %zu rpl.len %zu mismatch => EMSGSIZE\n" , + len, reply->len); + msg->rc = -EMSGSIZE ; + goto out; } +if (len > reply->bufsize || len > msg->bufsize) { +pr_warn_ratelimited ("len %zu exceeds buf %zu/%zu => EMSGSIZE\n" , + len, reply->bufsize, msg->bufsize); + msg->rc = -EMSGSIZE ; + goto out; + } +memcpy (msg->msg, reply->msg, len); + msg->len = len; + out:complete (&msg->response.work); }
drivers/s390/crypto/zcrypt_msgtype6.c +100 -51
188 lines not on this page · raw message
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v6 1/1] s390/zcrypt: Improve zcrypt reply message verification checks
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 16 lines
Add or improve checks related to buffer sizes and reply sizes to the handling of replies from the crypto cards for CCA, EP11 (AP message type 6) and ICA (AP type 50) messages. The verification code related to reply field length was not designed well and thus firmware deficiencies could lead to unexpected behavior in the zcrypt device driver. Thus improve the code to more closely inspect especially length fields at message replies.
Rework
zcrypt_msgtype6_receive(),zcrypt_msgtype6_receive_ep11()andzcrypt_msgtype50_receive()to validate reply lengths more carefully before copying data back into the request buffer. Usesize_tfor length calculations, reject inconsistent reply sizes, and add defensive handling for short invalid replies. For XCRB replies, validate both reply segments and derive the effective message length from the covered range instead of trusting only the second segment.
Quoted 1 line
Signed-off-by Harald Freudenberger <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Re: [PATCH v6 1/1] s390/zcrypt: Improve zcrypt reply message verification checks
In reply to Harald FreudenbergerQuoted 33 lines · Harald Freudenberger
Add or improve checks related to buffer sizes and reply sizes to the handling of replies from the crypto cards for CCA, EP11 (AP message type 6) and ICA (AP type 50) messages. The verification code related to reply field length was not designed well and thus firmware deficiencies could lead to unexpected behavior in the zcrypt device driver. Thus improve the code to more closely inspect especially length fields at message replies.
Rework
zcrypt_msgtype6_receive(),zcrypt_msgtype6_receive_ep11()andzcrypt_msgtype50_receive()to validate reply lengths more carefully before copying data back into the request buffer. Usesize_tfor length calculations, reject inconsistent reply sizes, and add defensive handling for short invalid replies. For XCRB replies, validate both reply segments and derive the effective message length from the covered range instead of trusting only the second segment.Signed-off-by Harald Freudenberger <[email protected]>--- drivers/s390/crypto/zcrypt_msgtype50.c | 39 ++++--- drivers/s390/crypto/zcrypt_msgtype6.c | 151 ++++++++++++++++--------- 2 files changed, 126 insertions(+), 64 deletions(-)drivers/s390/crypto/zcrypt_msgtype50.c +1
-1@@ -416,26 +416,39 @@ static void zcrypt_msgtype50_receive(struct ap_queue *aq, .reply_code = REP82_ERROR_MACHINE_FAILURE, };struct type80_hdr *t80h; -int len; +size_t len;
drivers/s390/crypto/zcrypt_msgtype50.c static void zcrypt_msgtype50_receive(struct ap_queue *aq, · line 429
Quoted 10 lines
drivers/s390/crypto/zcrypt_msgtype50.c +1
-5/* Copy the reply message to the request message buffer. */ if (!reply) goto out;/* ap_msg->rc indicates the error */ + t80h = reply->msg; -if (t80h->type ==TYPE80_RSP_CODE ) { - len = t80h->len; -if (len > reply->bufsize || len > msg->bufsize || - len != reply->len) { -pr_debug ("len mismatch => EMSGSIZE\n" );
I don't like this debug statement, its very undescriptive. What is len? What does it mismatch against? What does the mismatch mean?
The "=> EMSGSIZE" looks very uncommon for me as well, is this a common way of logging error paths?
Quoted 11 lines
drivers/s390/crypto/zcrypt_msgtype50.c +4
-7- msg->rc = -EMSGSIZE ; - goto out; - } -memcpy (msg->msg, reply->msg, len); - msg->len = len; - }else { -memcpy (msg->msg, reply->msg,sizeof (error_reply)); + +if (t80h->type !=TYPE80_RSP_CODE ) { +if (reply->len <sizeof (error_reply)) +memcpy (msg->msg, &error_reply,sizeof (error_reply));
drivers/s390/crypto/zcrypt_msgtype50.c static void zcrypt_msgtype50_receive(struct ap_queue *aq, · line 439
Quoted 10 lines
drivers/s390/crypto/zcrypt_msgtype50.c +9
-0+else +memcpy (msg->msg, reply->msg,sizeof (error_reply)); msg->len =sizeof (error_reply); + goto out; + } + + len = t80h->len; +if (len != reply->len) { +pr_warn_ratelimited ("len %zu rpl.len %zu mismatch => EMSGSIZE\n" , + len, reply->len);
Same here. What is len? rpl.len is a technical statement, but logs should be descriptive right?
drivers/s390/crypto/zcrypt_msgtype50.c static void zcrypt_msgtype50_receive(struct ap_queue *aq, · line 445
Quoted 6 lines
drivers/s390/crypto/zcrypt_msgtype50.c +5
-0+ msg->rc = -EMSGSIZE ; + goto out; } +if (len > reply->bufsize || len > msg->bufsize) { +pr_warn_ratelimited ("len %zu exceeds buf %zu/%zu => EMSGSIZE\n" , + len, reply->bufsize, msg->bufsize);
Why buf instead of buffer? Why safe space here?
Quoted 74 lines
drivers/s390/crypto/zcrypt_msgtype50.c +6
-0+ msg->rc = -EMSGSIZE ; + goto out; + } +memcpy (msg->msg, reply->msg, len); + msg->len = len; + out:complete (&msg->response.work); }drivers/s390/crypto/zcrypt_msgtype6.c +22
-23@@ -766,6 +766,13 @@ static int convert_type86_rng(struct zcrypt_queue *zq,if (msg->cprbx.ccp_rtcode !=0 || msg->cprbx.ccp_rscode !=0 )return -EINVAL ; +/* +* Note that offset2 and count2 have already been checked in +* zcrypt_msgtype6_receive(). So only check for not exceeding +* the hard coded rng buffer size. +*/ +if (msg->fmt2.count2 >ZCRYPT_RNG_BUFFER_SIZE ) +return -EMSGSIZE ;memcpy (buffer, data + msg->fmt2.offset2, msg->fmt2.count2);return msg->fmt2.count2; }@@ -928,48 +935,75 @@ static void zcrypt_msgtype6_receive(struct ap_queue *aq, };struct ap_response_type *resp_type = &msg->response;struct type86x_reply *t86r; -int len; +size_t len, len1, len2 =0 ;/* Copy the reply message to the request message buffer. */ if (!reply) goto out;/* ap_msg->rc indicates the error */ + t86r = reply->msg; -if (t86r->hdr.type ==TYPE86_RSP_CODE && - t86r->cprbx.cprb_ver_id ==0x02 ) { -switch (resp_type->type) { -case CEXXC_RESPONSE_TYPE_ICA : - len =sizeof (struct type86x_reply ) + t86r->length; -if (len > reply->bufsize || len > msg->bufsize || - len != reply->len) { -pr_debug ("len mismatch => EMSGSIZE\n" ); - msg->rc = -EMSGSIZE ; - goto out; - } -memcpy (msg->msg, reply->msg, len); - msg->len = len; -break ; -case CEXXC_RESPONSE_TYPE_XCRB : -if (t86r->fmt2.count2) - len = t86r->fmt2.offset2 + t86r->fmt2.count2; -else - len = t86r->fmt2.offset1 + t86r->fmt2.count1; -if (len > reply->bufsize || len > msg->bufsize || - len != reply->len) { -pr_debug ("len mismatch => EMSGSIZE\n" ); + +if (t86r->hdr.type !=TYPE86_RSP_CODE || + t86r->cprbx.cprb_ver_id !=0x02 ) { +if (reply->len <sizeof (error_reply)) +memcpy (msg->msg, &error_reply,sizeof (error_reply)); +else +memcpy (msg->msg, reply->msg,sizeof (error_reply)); + msg->len =sizeof (error_reply); + goto out; + } + +switch (resp_type->type) { +case CEXXC_RESPONSE_TYPE_ICA :
drivers/s390/crypto/zcrypt_msgtype6.c static void zcrypt_msgtype6_receive(struct ap_queue *aq, · line 967
Quoted 10 lines
drivers/s390/crypto/zcrypt_msgtype6.c +10
-0+ len =sizeof (struct type86x_reply ) + (size_t )t86r->length; +break ; +case CEXXC_RESPONSE_TYPE_XCRB : + len1 = (size_t )t86r->fmt2.offset1 + (size_t )t86r->fmt2.count1; +if (t86r->fmt2.offset1 > reply->len || + t86r->fmt2.count1 > reply->len) { +pr_warn_ratelimited ( +"offset1 %u count1 %u rpl.len %zu mismatch => EMSGSIZE\n" , + t86r->fmt2.offset1, t86r->fmt2.count1, + reply->len);
same here
drivers/s390/crypto/zcrypt_msgtype6.c static void zcrypt_msgtype6_receive(struct ap_queue *aq, · line 979
Quoted 12 lines
drivers/s390/crypto/zcrypt_msgtype6.c +12
-0+ msg->rc = -EMSGSIZE ; + goto out; + } +if (t86r->fmt2.count2) { + len2 = (size_t )t86r->fmt2.offset2 + + (size_t )t86r->fmt2.count2; +if (t86r->fmt2.offset2 > reply->len || + t86r->fmt2.count2 > reply->len) { +pr_warn_ratelimited ( +"offset2 %u count2 %u rpl.len %zu mismatch => EMSGSIZE\n" , + t86r->fmt2.offset2, t86r->fmt2.count2, + reply->len);
same here
Quoted 13 lines
drivers/s390/crypto/zcrypt_msgtype6.c +1
-8msg->rc = -EMSGSIZE ; goto out; } -memcpy (msg->msg, reply->msg, len); - msg->len = len; -break ; -default : -memcpy (msg->msg, &error_reply,sizeof (error_reply)); - msg->len =sizeof (error_reply); } - }else { -memcpy (msg->msg, reply->msg,sizeof (error_reply)); + len =max_t (size_t, len1, len2);
drivers/s390/crypto/zcrypt_msgtype6.c static void zcrypt_msgtype6_receive(struct ap_queue *aq, · line 994
Quoted 10 lines
drivers/s390/crypto/zcrypt_msgtype6.c +9
-0+break ; +default : +memcpy (msg->msg, &error_reply,sizeof (error_reply)); msg->len =sizeof (error_reply); + goto out; + } + +if (len != reply->len) { +pr_warn_ratelimited ("len %zu rpl.len %zu mismatch => EMSGSIZE\n" , + len, reply->len);
same here
drivers/s390/crypto/zcrypt_msgtype6.c static void zcrypt_msgtype6_receive(struct ap_queue *aq, · line 1000
Quoted 6 lines
drivers/s390/crypto/zcrypt_msgtype6.c +5
-0+ msg->rc = -EMSGSIZE ; + goto out; } +if (len > reply->bufsize || len > msg->bufsize) { +pr_warn_ratelimited ("len %zu exceeds buf %zu/%zu => EMSGSIZE\n" , + len, reply->bufsize, msg->bufsize);
same here
Quoted 54 lines
drivers/s390/crypto/zcrypt_msgtype6.c +19
-20+ msg->rc = -EMSGSIZE ; + goto out; + } +memcpy (msg->msg, reply->msg, len); + msg->len = len; + out:complete (&resp_type->work); }@@ -992,34 +1026,49 @@ static void zcrypt_msgtype6_receive_ep11(struct ap_queue *aq, };struct ap_response_type *resp_type = &msg->response;struct type86_ep11_reply *t86r; -int len; +size_t len;/* Copy the reply message to the request message buffer. */ if (!reply) goto out;/* ap_msg->rc indicates the error */ + t86r = reply->msg; -if (t86r->hdr.type ==TYPE86_RSP_CODE && - t86r->cprbx.cprb_ver_id ==0x04 ) { -switch (resp_type->type) { -case CEXXC_RESPONSE_TYPE_EP11 : - len = t86r->fmt2.offset1 + t86r->fmt2.count1; -if (len > reply->bufsize || len > msg->bufsize || - len != reply->len) { -pr_debug ("len mismatch => EMSGSIZE\n" ); - msg->rc = -EMSGSIZE ; - goto out; - } -memcpy (msg->msg, reply->msg, len); - msg->len = len; -break ; -default : + +if (t86r->hdr.type !=TYPE86_RSP_CODE || + t86r->cprbx.cprb_ver_id !=0x04 ) { +if (reply->len <sizeof (error_reply))memcpy (msg->msg, &error_reply,sizeof (error_reply)); - msg->len =sizeof (error_reply); - } - }else { -memcpy (msg->msg, reply->msg,sizeof (error_reply)); +else +memcpy (msg->msg, reply->msg,sizeof (error_reply)); msg->len =sizeof (error_reply); + goto out; } + +switch (resp_type->type) { +case CEXXC_RESPONSE_TYPE_EP11 : + len = t86r->fmt2.offset1 + (size_t )t86r->fmt2.count1;
drivers/s390/crypto/zcrypt_msgtype6.c static void zcrypt_msgtype6_receive_ep11(struct ap_queue *aq, · line 1059
Quoted 10 lines
drivers/s390/crypto/zcrypt_msgtype6.c +10
-0+break ; +default : +memcpy (msg->msg, &error_reply,sizeof (error_reply)); + msg->len =sizeof (error_reply); + goto out; + } + +if (len != reply->len) { +pr_warn_ratelimited ("len %zu rpl.len %zu mismatch => EMSGSIZE\n" , + len, reply->len);
same here
drivers/s390/crypto/zcrypt_msgtype6.c static void zcrypt_msgtype6_receive(struct ap_queue *aq, · line 1000
Quoted 6 lines
drivers/s390/crypto/zcrypt_msgtype6.c +6
-0+ msg->rc = -EMSGSIZE ; + goto out; + } +if (len > reply->bufsize || len > msg->bufsize) { +pr_warn_ratelimited ("len %zu exceeds buf %zu/%zu => EMSGSIZE\n" , + len, reply->bufsize, msg->bufsize);
same here
Quoted 9 lines
drivers/s390/crypto/zcrypt_msgtype6.c +6
-0+ msg->rc = -EMSGSIZE ; + goto out; + } +memcpy (msg->msg, reply->msg, len); + msg->len = len; + out:complete (&resp_type->work); }
Re: [PATCH v6 1/1] s390/zcrypt: Improve zcrypt reply message verification checks
Quoted 67 lines · Finn Callies
Quoted 35 lines · Harald Freudenberger
Add or improve checks related to buffer sizes and reply sizes to the handling of replies from the crypto cards for CCA, EP11 (AP message type 6) and ICA (AP type 50) messages. The verification code related to reply field length was not designed well and thus firmware deficiencies could lead to unexpected behavior in the zcrypt device driver. Thus improve the code to more closely inspect especially length fields at message replies.
Rework
zcrypt_msgtype6_receive(),zcrypt_msgtype6_receive_ep11()andzcrypt_msgtype50_receive()to validate reply lengths more carefully before copying data back into the request buffer. Usesize_tfor length calculations, reject inconsistent reply sizes, and add defensive handling for short invalid replies. For XCRB replies, validate both reply segments and derive the effective message length from the covered range instead of trusting only the second segment.Signed-off-by Harald Freudenberger <[email protected]>---
drivers/s390/crypto/zcrypt_msgtype50.c| 39 ++++--- drivers/s390/crypto/zcrypt_msgtype6.c | 151 ++++++++++++++++---------2 files changed, 126 insertions(+), 64 deletions(-)drivers/s390/crypto/zcrypt_msgtype50.c +1
-1@@ -416,26 +416,39 @@ static void zcrypt_msgtype50_receive(structap_queue *aq, .reply_code = REP82_ERROR_MACHINE_FAILURE, }; struct type80_hdr *t80h; - int len; + size_t len; /* Copy the reply message to the request message buffer. */ if (!reply)Quoted 8 lines
goto out; /*
ap_msg->rcindicates the error */ +
t80h =reply->msg;
- if (t80h->type==TYPE80_RSP_CODE) {
- len =t80h->len;
- if (len >reply->bufsize|| len >msg->bufsize|| - len !=reply->len) {
-pr_debug("len mismatch => EMSGSIZE\n");I don't like this debug statement, its very undescriptive. What is len? What does it mismatch against? What does the mismatch mean?
The "=> EMSGSIZE" looks very uncommon for me as well, is this a common way of logging error paths?
Quoted 16 lines
-
msg->rc=-EMSGSIZE;
- goto out;
- }
-memcpy(msg->msg, reply->msg, len);
-msg->len= len;
- } else {
-memcpy(msg->msg, reply->msg, sizeof(error_reply)); +
+ if (t80h->type!=TYPE80_RSP_CODE) {
+ if (reply->len<sizeof(error_reply))
+memcpy(msg->msg, &error_reply, sizeof(error_reply)); + else
+memcpy(msg->msg, reply->msg, sizeof(error_reply));msg->len=sizeof(error_reply);
+ goto out;
+ }
Quoted 8 lines
Quoted 6 lines
+
+ len =t80h->len;
+ if (len !=reply->len) {
+ pr_warn_ratelimited("len %zu rpl.len %zu mismatch => EMSGSIZE\n",
+ len,reply->len);Same here. What is len? rpl.len is a technical statement, but logs should be descriptive right?
I suggest something like "... mismatch: EMSGSIZE"
Additionally do not hardcode return code strings. Either use a function which converts rc to string or Just use %d and print the rc itself.
Quoted 237 lines
Quoted 7 lines
+
msg->rc=-EMSGSIZE;
+ goto out;
}
+ if (len >reply->bufsize|| len >msg->bufsize) {
+ pr_warn_ratelimited("len %zu exceeds buf %zu/%zu => EMSGSIZE\n", + len,reply->bufsize,msg->bufsize);Why buf instead of buffer? Why safe space here?
Quoted 82 lines
+
msg->rc=-EMSGSIZE;
+ goto out;
+ }
+memcpy(msg->msg, reply->msg, len);
+msg->len= len;
+
out:
complete(&msg->response.work);
}drivers/s390/crypto/zcrypt_msgtype6.c +8
-1@@ -766,6 +766,13 @@ static int convert_type86_rng(struct zcrypt_queue *zq, if (msg->cprbx.ccp_rtcode != 0 || msg->cprbx.ccp_rscode != 0) return -EINVAL; + /* + * Note that offset2 and count2 have already been checked in + * zcrypt_msgtype6_receive(). So only check for not exceeding + * the hard coded rng buffer size. + */ + if (msg->fmt2.count2 > ZCRYPT_RNG_BUFFER_SIZE) + return -EMSGSIZE; memcpy(buffer, data + msg->fmt2.offset2, msg->fmt2.count2); return msg->fmt2.count2; }@@ -928,48 +935,75 @@ static void zcrypt_msgtype6_receive(structap_queue *aq, }; struct ap_response_type *resp_type = &msg->response; struct type86x_reply *t86r; - int len; + size_t len, len1, len2 = 0; /* Copy the reply message to the request message buffer. */ if (!reply)goto out; /*
ap_msg->rcindicates the error */ +
t86r =reply->msg;
- if (t86r->hdr.type==TYPE86_RSP_CODE&&
-t86r->cprbx.cprb_ver_id==0x02) {
- switch (resp_type->type) {
- caseCEXXC_RESPONSE_TYPE_ICA:
- len =sizeof(struct type86x_reply)+t86r->length; - if (len >reply->bufsize|| len >msg->bufsize|| - len !=reply->len) {
-pr_debug("len mismatch => EMSGSIZE\n"); -msg->rc=-EMSGSIZE;
- goto out;
- }
-memcpy(msg->msg, reply->msg, len);
-msg->len= len;
- break;
- caseCEXXC_RESPONSE_TYPE_XCRB:
- if (t86r->fmt2.count2)
- len =t86r->fmt2.offset2+t86r->fmt2.count2; - else
- len =t86r->fmt2.offset1+t86r->fmt2.count1; - if (len >reply->bufsize|| len >msg->bufsize|| - len !=reply->len) {
-pr_debug("len mismatch => EMSGSIZE\n");drivers/s390/crypto/zcrypt_msgtype6.c +21
-0+ + if (t86r->hdr.type != TYPE86_RSP_CODE || + t86r->cprbx.cprb_ver_id != 0x02) { + if (reply->len < sizeof(error_reply)) + memcpy(msg->msg, &error_reply, sizeof(error_reply)); + else + memcpy(msg->msg, reply->msg, sizeof(error_reply)); + msg->len = sizeof(error_reply); + goto out; + } + + switch (resp_type->type) { + case CEXXC_RESPONSE_TYPE_ICA: + len = sizeof(struct type86x_reply) + (size_t)t86r->length; + break; + case CEXXC_RESPONSE_TYPE_XCRB: + len1 = (size_t)t86r->fmt2.offset1 + (size_t)t86r->fmt2.count1; + if (t86r->fmt2.offset1 > reply->len || + t86r->fmt2.count1 > reply->len) { + pr_warn_ratelimited( + "offset1 %u count1 %u rpl.len %zu mismatch =>Quoted 3 lines
EMSGSIZE\n",
+t86r->fmt2.offset1,t86r->fmt2.count1, +reply->len);same here
Quoted 5 lines
+
msg->rc=-EMSGSIZE;
+ goto out;
+ }
+ if (t86r->fmt2.count2) {
+ len2 = (size_t)t86r->fmt2.offset2 +Quoted 8 lines
+ (size_t)t86r->fmt2.count2;
+ if (t86r->fmt2.offset2>reply->len||
+t86r->fmt2.count2>reply->len) {
+ pr_warn_ratelimited(
+ "offset2 %u count2 %u rpl.len %zu mismatch => EMSGSIZE\n",
+t86r->fmt2.offset2,t86r->fmt2.count2, +reply->len);same here
Quoted 16 lines
msg->rc=-EMSGSIZE;
goto out;
}
-memcpy(msg->msg, reply->msg, len);
-msg->len= len;
- break;
- default:
-memcpy(msg->msg, &error_reply, sizeof(error_reply)); -msg->len=sizeof(error_reply);
}
- } else {
-memcpy(msg->msg, reply->msg, sizeof(error_reply)); + len =max_t(size_t, len1, len2);
+ break;
+ default:
+memcpy(msg->msg, &error_reply, sizeof(error_reply));Quoted 8 lines
msg->len=sizeof(error_reply);
+ goto out;
+ }
+
+ if (len !=reply->len) {
+ pr_warn_ratelimited("len %zu rpl.len %zu mismatch => EMSGSIZE\n",
+ len,reply->len);same here
Quoted 6 lines
+
msg->rc=-EMSGSIZE;
+ goto out;
}
+ if (len >reply->bufsize|| len >msg->bufsize) {
+ pr_warn_ratelimited("len %zu exceeds buf %zu/%zu => EMSGSIZE\n", + len,reply->bufsize,msg->bufsize);same here
Quoted 63 lines
+
msg->rc=-EMSGSIZE;
+ goto out;
+ }
+memcpy(msg->msg, reply->msg, len);
+msg->len= len;
+
out:
complete(&resp_type->work);
}drivers/s390/crypto/zcrypt_msgtype6.c +1
-1@@ -992,34 +1026,49 @@ static void zcrypt_msgtype6_receive_ep11(structap_queue *aq, }; struct ap_response_type *resp_type = &msg->response; struct type86_ep11_reply *t86r; - int len; + size_t len; /* Copy the reply message to the request message buffer. */ if (!reply)goto out; /*
ap_msg->rcindicates the error */ +
t86r =reply->msg;
- if (t86r->hdr.type==TYPE86_RSP_CODE&&
-t86r->cprbx.cprb_ver_id==0x04) {
- switch (resp_type->type) {
- caseCEXXC_RESPONSE_TYPE_EP11:
- len =t86r->fmt2.offset1+t86r->fmt2.count1; - if (len >reply->bufsize|| len >msg->bufsize|| - len !=reply->len) {
-pr_debug("len mismatch => EMSGSIZE\n"); -msg->rc=-EMSGSIZE;
- goto out;
- }
-memcpy(msg->msg, reply->msg, len);
-msg->len= len;
- break;
- default:
+
+ if (t86r->hdr.type!=TYPE86_RSP_CODE||
+t86r->cprbx.cprb_ver_id!=0x04) {
+ if (reply->len<sizeof(error_reply))memcpy(msg->msg, &error_reply, sizeof(error_reply)); -msg->len=sizeof(error_reply);
- }
- } else {
-memcpy(msg->msg, reply->msg, sizeof(error_reply)); + else
+memcpy(msg->msg, reply->msg, sizeof(error_reply));msg->len=sizeof(error_reply);
+ goto out;
}drivers/s390/crypto/zcrypt_msgtype6.c +13
-0+ + switch (resp_type->type) { + case CEXXC_RESPONSE_TYPE_EP11: + len = t86r->fmt2.offset1 + (size_t)t86r->fmt2.count1; + break; + default: + memcpy(msg->msg, &error_reply, sizeof(error_reply)); + msg->len = sizeof(error_reply); + goto out; + } + + if (len != reply->len) { + pr_warn_ratelimited("len %zu rpl.len %zu mismatch =>Quoted 2 lines
EMSGSIZE\n",
+ len,reply->len);same here
Quoted 6 lines
+
msg->rc=-EMSGSIZE;
+ goto out;
+ }
+ if (len >reply->bufsize|| len >msg->bufsize) {
+ pr_warn_ratelimited("len %zu exceeds buf %zu/%zu => EMSGSIZE\n", + len,reply->bufsize,msg->bufsize);same here
Quoted 9 lines
+
msg->rc=-EMSGSIZE;
+ goto out;
+ }
+memcpy(msg->msg, reply->msg, len);
+msg->len= len;
+
out:
complete(&resp_type->work);
}