[S390] drivers/s390/crypto: Move dereference to after IS_ERR test

If reply is ERR_PTR(...), then it should not be dereferenced, so I have
moved the dereference from the declaration to after the IS_ERR test.

The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@match exists@
expression x, E;
identifier fld;
position p1,p2;
@@

(
x = E;
|
x = E
|
x@p1->fld
... when != x = E
IS_ERR(x@p2)
... when any
)

@other_match exists@
expression match.x, E1, E2;
position match.p1,match.p2;
@@

x = E1
... when != x = E2
    when != x@p1
x@p2

@ script:python depends on !other_match@
p1 << match.p1;
p2 << match.p2;
@@

print "* file %s dereference %s test %s" % (p1[0].file,p1[0].line,p2[0].line)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c
index 12da4815ba8e..17ba81b58c78 100644
--- a/drivers/s390/crypto/zcrypt_pcica.c
+++ b/drivers/s390/crypto/zcrypt_pcica.c
@@ -247,17 +247,21 @@ static void zcrypt_pcica_receive(struct ap_device *ap_dev,
                 .type = TYPE82_RSP_CODE,
                 .reply_code = REP82_ERROR_MACHINE_FAILURE,
         };
-        struct type84_hdr *t84h = reply->message;
+        struct type84_hdr *t84h;
         int length;
 
         /* Copy the reply message to the request message buffer. */
-        if (IS_ERR(reply))
+        if (IS_ERR(reply)) {
                 memcpy(msg->message, &error_reply, sizeof(error_reply));
-        else if (t84h->code == TYPE84_RSP_CODE) {
+                goto out;
+        }
+        t84h = reply->message;
+        if (t84h->code == TYPE84_RSP_CODE) {
                 length = min(PCICA_MAX_RESPONSE_SIZE, (int) t84h->len);
                 memcpy(msg->message, reply->message, length);
         } else
                 memcpy(msg->message, reply->message, sizeof error_reply);
+out:
         complete((struct completion *) msg->private);
 }