From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 30 Aug 2019 15:38:31 +0000 (+0200)
Subject: libceph: directly skip to the end of redirect reply
X-Git-Tag: v5.7-rc1~39^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb0e681dda33adac516dd74723b757c5c2feafe6;p=thirdparty%2Fkernel%2Flinux.git

libceph: directly skip to the end of redirect reply

Coverity complains about a double write to *p.  Don't bother with
osd_instructions and directly skip to the end of redirect reply.

Reported-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index f9ec6a6568bdc..998e26b75a789 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -3483,9 +3483,6 @@ static int ceph_redirect_decode(void **p, void *end,
 		goto e_inval;
 	}
 
-	len = ceph_decode_32(p);
-	*p += len; /* skip osd_instructions */
-
 	/* skip the rest */
 	*p = struct_end;
 out: