From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 27 Jul 2018 17:45:36 +0000 (+0200)
Subject: libceph: weaken sizeof check in ceph_x_verify_authorizer_reply()
X-Git-Tag: v4.14.86~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14118df4e7b4738815f222f5b20fceb3957ab206;p=platform%2Fkernel%2Flinux-rpi.git

libceph: weaken sizeof check in ceph_x_verify_authorizer_reply()

commit f1d10e04637924f2b00a0fecdd2ca4565f5cfc3f upstream.

Allow for extending ceph_x_authorize_reply in the future.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
index 10eb759bbcb4..2bf9d9f7ddf3 100644
--- a/net/ceph/auth_x.c
+++ b/net/ceph/auth_x.c
@@ -737,8 +737,10 @@ static int ceph_x_verify_authorizer_reply(struct ceph_auth_client *ac,
 	ret = ceph_x_decrypt(&au->session_key, &p, p + CEPHX_AU_ENC_BUF_LEN);
 	if (ret < 0)
 		return ret;
-	if (ret != sizeof(*reply))
-		return -EPERM;
+	if (ret < sizeof(*reply)) {
+		pr_err("bad size %d for ceph_x_authorize_reply\n", ret);
+		return -EINVAL;
+	}
 
 	if (au->nonce + 1 != le64_to_cpu(reply->nonce_plus_one))
 		ret = -EPERM;