From 2effe3b0d3fa51fc627c970353de2e326bcf1ef2 Mon Sep 17 00:00:00 2001
From: Amar Tumballi <amarts@redhat.com>
Date: Thu, 1 Nov 2018 07:16:32 +0530
Subject: protocol: remove the option 'verify-volfile-checksum'

'getspec' operation is not used between 'client' and 'server' ever since
we have off-loaded volfile management to glusterd, ie, at least 7 years.

No reason to keep the dead code! The removed option had no meaning,
as glusterd didn't provide a way to set (or unset) this option. So,
no regression should be observed from any of the existing glusterfs
deployment, supported or unsupported.

Updates: CVE-2018-14653

Updates: bz#1644756
Change-Id: I4a2e0f673c5bcd4644976a61dbd2d37003a428eb
Signed-off-by: Amar Tumballi <amarts@redhat.com>
---
 xlators/protocol/client/src/client-handshake.c | 85 +-------------------------
 1 file changed, 1 insertion(+), 84 deletions(-)

(limited to 'xlators/protocol/client/src/client-handshake.c')

diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 5feeca5411d..ed9d0a5d9d8 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -34,94 +34,11 @@ typedef struct client_fd_lk_local {
     clnt_fd_ctx_t *fdctx;
 } clnt_fd_lk_local_t;
 
-int
-client3_getspec_cbk(struct rpc_req *req, struct iovec *iov, int count,
-                    void *myframe)
-{
-    gf_getspec_rsp rsp = {
-        0,
-    };
-    call_frame_t *frame = NULL;
-    int ret = 0;
-
-    frame = myframe;
-
-    if (!frame || !frame->this) {
-        gf_msg(THIS->name, GF_LOG_ERROR, EINVAL, PC_MSG_INVALID_ENTRY,
-               "frame not found with the request, returning EINVAL");
-        rsp.op_ret = -1;
-        rsp.op_errno = EINVAL;
-        goto out;
-    }
-    if (-1 == req->rpc_status) {
-        gf_msg(frame->this->name, GF_LOG_WARNING, ENOTCONN,
-               PC_MSG_RPC_STATUS_ERROR,
-               "received RPC status error, "
-               "returning ENOTCONN");
-        rsp.op_ret = -1;
-        rsp.op_errno = ENOTCONN;
-        goto out;
-    }
-
-    ret = xdr_to_generic(*iov, &rsp, (xdrproc_t)xdr_gf_getspec_rsp);
-    if (ret < 0) {
-        gf_msg(frame->this->name, GF_LOG_ERROR, EINVAL,
-               PC_MSG_XDR_DECODING_FAILED,
-               "XDR decoding failed, returning EINVAL");
-        rsp.op_ret = -1;
-        rsp.op_errno = EINVAL;
-        goto out;
-    }
-
-    if (-1 == rsp.op_ret) {
-        gf_msg(frame->this->name, GF_LOG_WARNING, 0, PC_MSG_VOL_FILE_NOT_FOUND,
-               "failed to get the 'volume "
-               "file' from server");
-        goto out;
-    }
-
-out:
-    CLIENT_STACK_UNWIND(getspec, frame, rsp.op_ret, rsp.op_errno, rsp.spec);
-
-    /* Don't use 'GF_FREE', this is allocated by libc */
-    free(rsp.spec);
-    free(rsp.xdata.xdata_val);
-
-    return 0;
-}
 
 int32_t
 client3_getspec(call_frame_t *frame, xlator_t *this, void *data)
 {
-    clnt_conf_t *conf = NULL;
-    clnt_args_t *args = NULL;
-    gf_getspec_req req = {
-        0,
-    };
-    int op_errno = ESTALE;
-    int ret = 0;
-
-    if (!frame || !this || !data)
-        goto unwind;
-
-    args = data;
-    conf = this->private;
-    req.flags = args->flags;
-    req.key = (char *)args->name;
-
-    ret = client_submit_request(this, &req, frame, conf->handshake,
-                                GF_HNDSK_GETSPEC, client3_getspec_cbk, NULL,
-                                NULL, 0, NULL, 0, NULL,
-                                (xdrproc_t)xdr_gf_getspec_req);
-
-    if (ret) {
-        gf_msg(this->name, GF_LOG_WARNING, 0, PC_MSG_SEND_REQ_FAIL,
-               "failed to send the request");
-    }
-
-    return 0;
-unwind:
-    CLIENT_STACK_UNWIND(getspec, frame, -1, op_errno, NULL);
+    CLIENT_STACK_UNWIND(getspec, frame, -1, ENOSYS, NULL);
     return 0;
 }
 
-- 
cgit