From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 0B438C43387 for ; Fri, 11 Jan 2019 15:07:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C6F5A21841 for ; Fri, 11 Jan 2019 15:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547219258; bh=OA0f2JQm2xgh5fqsT70Y1ecSJU+jHBDIbWY5b0RdNmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dJN4SNnxWqtM4+5Gc4da7JlzYIyX6DWGBAxWwfciWu83+wY2oci3TKMhR2Alir+si SBw7K8eql1lKGRLQeMl+V9VNwL71P8ULeetr283iJS0BLZ5qMOZ5aVuSk8Kbx1HjGi Wi9+p5pKX9wMDgIwF0xbxZDQOX5OOxddc5WRMvRs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388062AbfAKPHh (ORCPT ); Fri, 11 Jan 2019 10:07:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:47094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388508AbfAKO2Y (ORCPT ); Fri, 11 Jan 2019 09:28:24 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9EE422133F; Fri, 11 Jan 2019 14:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216904; bh=OA0f2JQm2xgh5fqsT70Y1ecSJU+jHBDIbWY5b0RdNmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hExPI9ypcP+vp1mZRlxQWamZS11ePAYOl8po5b4yRVItuy4m0pB+0WEJzvLzaEGC2 R5qWTJSasgTum/Q78HCyGYHeXJEXnJ693w21g/7RZyMW2C66y5xE9vGcGTxaA6sz2+ smMAK/7t/k4daA4yzw4oaydvzKgDJtm6a/4f6hO0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Hutchings , Ilya Dryomov Subject: [PATCH 4.9 34/63] libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature() Date: Fri, 11 Jan 2019 15:14:37 +0100 Message-Id: <20190111131051.026277590@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131046.387528003@linuxfoundation.org> References: <20190111131046.387528003@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilya Dryomov Upstream commit cc255c76c70f ("libceph: implement CEPHX_V2 calculation mode") was adjusted incorrectly: CEPH_FEATURE_CEPHX_V2 if condition got inverted, thus breaking 4.9.144 and later kernels for all setups that use cephx. Cc: Ben Hutchings Signed-off-by: Ilya Dryomov --- net/ceph/auth_x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ceph/auth_x.c +++ b/net/ceph/auth_x.c @@ -804,7 +804,7 @@ static int calc_signature(struct ceph_x_ void *enc_buf = au->enc_buf; int ret; - if (msg->con->peer_features & CEPH_FEATURE_CEPHX_V2) { + if (!(msg->con->peer_features & CEPH_FEATURE_CEPHX_V2)) { struct { __le32 len; __le32 header_crc;