1 files changed, 24 insertions, 28 deletions

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 688cc31040f3..e8ed848ecd67 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -224,38 +224,34 @@ static int rsi_parse(struct cache_detail *cd,
 
         /* major/minor */
         len = qword_get(&mesg, buf, mlen);
-        if (len < 0)
+        if (len <= 0)
                 goto out;
-        if (len == 0) {
+        rsii.major_status = simple_strtoul(buf, &ep, 10);
+        if (*ep)
+                goto out;
+        len = qword_get(&mesg, buf, mlen);
+        if (len <= 0)
+                goto out;
+        rsii.minor_status = simple_strtoul(buf, &ep, 10);
+        if (*ep)
                 goto out;
-        } else {
-                rsii.major_status = simple_strtoul(buf, &ep, 10);
-                if (*ep)
-                        goto out;
-                len = qword_get(&mesg, buf, mlen);
-                if (len <= 0)
-                        goto out;
-                rsii.minor_status = simple_strtoul(buf, &ep, 10);
-                if (*ep)
-                        goto out;
 
-                /* out_handle */
-                len = qword_get(&mesg, buf, mlen);
-                if (len < 0)
-                        goto out;
-                status = -ENOMEM;
-                if (dup_to_netobj(&rsii.out_handle, buf, len))
-                        goto out;
+        /* out_handle */
+        len = qword_get(&mesg, buf, mlen);
+        if (len < 0)
+                goto out;
+        status = -ENOMEM;
+        if (dup_to_netobj(&rsii.out_handle, buf, len))
+                goto out;
 
-                /* out_token */
-                len = qword_get(&mesg, buf, mlen);
-                status = -EINVAL;
-                if (len < 0)
-                        goto out;
-                status = -ENOMEM;
-                if (dup_to_netobj(&rsii.out_token, buf, len))
-                        goto out;
-        }
+        /* out_token */
+        len = qword_get(&mesg, buf, mlen);
+        status = -EINVAL;
+        if (len < 0)
+                goto out;
+        status = -ENOMEM;
+        if (dup_to_netobj(&rsii.out_token, buf, len))
+                goto out;
         rsii.h.expiry_time = expiry;
         rsip = rsi_update(&rsii, rsip);
         status = 0;