From: Greg Kroah-Hartman Date: Wed, 27 Feb 2019 14:27:19 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.9.162~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61bb808699287d6fb3737858c5dc12d7379dc6ed;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: libceph-handle-an-empty-authorize-reply.patch --- diff --git a/queue-4.4/libceph-handle-an-empty-authorize-reply.patch b/queue-4.4/libceph-handle-an-empty-authorize-reply.patch new file mode 100644 index 00000000000..9020fe0ff5e --- /dev/null +++ b/queue-4.4/libceph-handle-an-empty-authorize-reply.patch @@ -0,0 +1,63 @@ +From 0fd3fd0a9bb0b02b6435bb7070e9f7b82a23f068 Mon Sep 17 00:00:00 2001 +From: Ilya Dryomov +Date: Tue, 5 Feb 2019 20:30:27 +0100 +Subject: libceph: handle an empty authorize reply + +From: Ilya Dryomov + +commit 0fd3fd0a9bb0b02b6435bb7070e9f7b82a23f068 upstream. + +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] +Signed-off-by: Greg Kroah-Hartman + +--- + net/ceph/messenger.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +--- a/net/ceph/messenger.c ++++ b/net/ceph/messenger.c +@@ -2049,15 +2049,19 @@ static int process_connect(struct ceph_c + 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; ++ } + } + } + diff --git a/queue-4.4/series b/queue-4.4/series index 45986f382a7..a9bf6f3c42e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -27,3 +27,4 @@ sit-check-if-ipv6-enabled-before-calling-ip6_err_gen_icmpv6_unreach.patch net-mlx4_en-force-checksum_none-for-short-ethernet-frames.patch arcv2-enable-unaligned-access-in-early-asm-code.patch revert-bridge-do-not-add-port-to-router-list-when-receives-query-with-source-0.0.0.0.patch +libceph-handle-an-empty-authorize-reply.patch