Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A6ADC43381 for ; Mon, 25 Feb 2019 20:11:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE1E12087C for ; Mon, 25 Feb 2019 20:11:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="suZEG8Uk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726947AbfBYULd (ORCPT ); Mon, 25 Feb 2019 15:11:33 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:37310 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726888AbfBYULd (ORCPT ); Mon, 25 Feb 2019 15:11:33 -0500 Received: by mail-wm1-f66.google.com with SMTP id x10so210644wmg.2 for ; Mon, 25 Feb 2019 12:11:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kJ5ACNUqE/d91o2swCmMOFOIy+duNhcCfXqR4BEG1Dg=; b=suZEG8Uk+q7oEqSIOkjF5ExKrUUx0mrSD84fDAmNaQtUOxtSvp750memiAZe6ZA3Fx JQc1CGG0LryFsLm+71ESGnH7dvLe5kCzX4JB2ZriFi/s4R7YDuZideXI5/O+2Dq0xeFr TLYMKW3+uT5oXkHX9q0gjq0Df0mZYquET/ubce+OddHrGUwkPdk9Wal7n0wW7sDAkeJB g0A1rsNxdRM5uTrF21QZit8T1d6mVopgxpBvjrl1MlI7o/186uzHePwho817ClnH+Xbe 7Ye/hjeSPjrwI+K6olUi66IHoAhrno0kQhlEu8Z9/DQyjcTeRQoQx53GZg2VwuWZfJ+5 c65A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kJ5ACNUqE/d91o2swCmMOFOIy+duNhcCfXqR4BEG1Dg=; b=TitucgyUfffGuBmF/kslrvywfhHjlnocIUiEkpon0TXrHxHyWHijkQYElUnZQoC0qN kTWsFcbFJzw/9XrDhMcWVGFezX9hVYOg0EvKUdnBAyjcZPF1axUKS/NenbJX5c79QMn/ cNq/Y/+TLF+XIPELp3DrJ9/YCMqNm1fsw54N/VAnY610YW6LUGbqrlplhQM0EaePyy98 Lb2jqfwvu986oiaWJODyWzJrF617b/WOhkhbsp97Vr9qbdeOFyNidDUL0UhdHJIKQmNO a1muQjySEP4YKex81f5HOtjykNQI5qe2fSv2qPiPJ+RhQnC2/7miNwHxBT3vfHG1U/kl oTng== X-Gm-Message-State: AHQUAuZPFE7gINGYM0ZswRjTff2a0KHDnnD49wS0187/j+kQFFHd7UjW ZUpC7+IrgmcBFkRQ5XKIAmTHgBhT X-Google-Smtp-Source: AHgI3Ibvhp4LLmhyiU2FkPnYKHWF5H5+jZwyzAQ/lr8a9zBY+tx1lJ9HexjK9k4ESDF6VAX54cPB3g== X-Received: by 2002:a1c:4155:: with SMTP id o82mr321762wma.122.1551125491188; Mon, 25 Feb 2019 12:11:31 -0800 (PST) Received: from kwango.redhat.com (ovpn-brq.redhat.com. [213.175.37.11]) by smtp.gmail.com with ESMTPSA id c8sm6323836wrx.6.2019.02.25.12.11.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Feb 2019 12:11:30 -0800 (PST) From: Ilya Dryomov To: stable@vger.kernel.org Cc: Greg KH Subject: [PATCH 3.18, 4.4] libceph: handle an empty authorize reply Date: Mon, 25 Feb 2019 21:12:06 +0100 Message-Id: <20190225201206.30079-1-idryomov@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The authorize reply can be empty, for example when the ticket used to build the authorizer is too old and TAG_BADAUTHORIZER is returned from the service. Calling ->verify_authorizer_reply() results in an attempt to decrypt and validate (somewhat) random data in au->buf (most likely the signature block from calc_signature()), which fails and ends up in con_fault_finish() with !con->auth_retry. The ticket isn't invalidated and the connection is retried again and again until a new ticket is obtained from the monitor: libceph: osd2 192.168.122.1:6809 bad authorize reply libceph: osd2 192.168.122.1:6809 bad authorize reply libceph: osd2 192.168.122.1:6809 bad authorize reply libceph: osd2 192.168.122.1:6809 bad authorize reply Let TAG_BADAUTHORIZER handler kick in and increment con->auth_retry. Cc: stable@vger.kernel.org Fixes: 5c056fdc5b47 ("libceph: verify authorize reply on connect") Link: https://tracker.ceph.com/issues/20164 Signed-off-by: Ilya Dryomov Reviewed-by: Sage Weil [idryomov@gmail.com: backport to 4.4: extra arg, no CEPHX_V2] --- net/ceph/messenger.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 3e6897efe1eb..3ed2796d008b 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2049,15 +2049,19 @@ static int process_connect(struct ceph_connection *con) dout("process_connect on %p tag %d\n", con, (int)con->in_tag); if (con->auth_reply_buf) { + int len = le32_to_cpu(con->in_reply.authorizer_len); + /* * Any connection that defines ->get_authorizer() * should also define ->verify_authorizer_reply(). * See get_connect_authorizer(). */ - ret = con->ops->verify_authorizer_reply(con, 0); - if (ret < 0) { - con->error_msg = "bad authorize reply"; - return ret; + if (len) { + ret = con->ops->verify_authorizer_reply(con, 0); + if (ret < 0) { + con->error_msg = "bad authorize reply"; + return ret; + } } } -- 2.19.2