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,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 A4CC6C43387 for ; Wed, 9 Jan 2019 14:17:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69AF12075C for ; Wed, 9 Jan 2019 14:17:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Gtc1QsEQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731303AbfAIORZ (ORCPT ); Wed, 9 Jan 2019 09:17:25 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:35503 "EHLO mail-wm1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731169AbfAIORY (ORCPT ); Wed, 9 Jan 2019 09:17:24 -0500 Received: by mail-wm1-f52.google.com with SMTP id t200so8465994wmt.0 for ; Wed, 09 Jan 2019 06:17:23 -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; bh=Fvl6INNy0w2nfNe1SQ2Cht/eh2qw038+7SR5H5g7Dsk=; b=Gtc1QsEQ7dAyai7nKAittEmTElBui3EjAx8GqPsn21/98ZK5QjPMHho4h07lUrS9Nk xBVi+largSf7yDAp1DEX6Y7wKxkuh6nMaP6z0Z67hxPL07kZkoeWWrCu0qY/NRKiV3Zb JiUYSDGE6mefbg1rne9eo7hWghoA2Lkj+iNZV5W27aUQAbo9VJS3Ws6eujxKnTTmTeET yGDkI9j+BJRB8YuwjAgx+awOjWcWucBt77MZPKTEznAueglwa2UbTYHPYGE3dvIY6ZpQ pEeL+y8xcyNglPPtYYHTMTrY8vfy6GxY1UdS881O5ACqvY/6IEkxAYD1WRWP146AR7Ec dvjQ== 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; bh=Fvl6INNy0w2nfNe1SQ2Cht/eh2qw038+7SR5H5g7Dsk=; b=Z50xmndP5XaosROfi0AdWcimGNWMFDVVAJG7ePUBf4UGZJ4R31bElVjbPyt//zG2uv 3VhAhikC77M6mbEwM7ZV4bs6o/PNtSZein57Nkxf35MRXgGE4jhtHiZ8yUF/jOFFxEiI z955T+e0jiXYtJA/KcZsGbj9oDGgyg0Z/O937SUlSWI6sNJtOMFK1eZqRdapyR0JDXiU Se8HWkh7TxEYFk7g3ur7qGRYACa0ov6tRTdodTJK+YFch3SAnGF0Ok1fqCEfA2XRRLIq LsiA0MGHRubKR4oD2++WaOwyhdLg1sAqpp0LRTNSoWf9rebRKELYvIZr4V1ihOXFU0RF +wdg== X-Gm-Message-State: AJcUukc+0h9deBOXVhvCxHViA0GS9lHnhY0oFuiBT60fyx8lqTAFBo94 eRQ8vJBsxEqSifYFP4l32pkGu1Ux X-Google-Smtp-Source: ALg8bN6cu00KZfIwG//Mi9cdSwRdoTnvNR2aAB2I4UzNEZX/0H5G4I9n86cV7tqTlRo8bh96cSKHyw== X-Received: by 2002:a1c:e913:: with SMTP id q19mr6007625wmc.55.1547043442700; Wed, 09 Jan 2019 06:17:22 -0800 (PST) Received: from orange.local (ip-89-102-68-132.net.upcbroadband.cz. [89.102.68.132]) by smtp.gmail.com with ESMTPSA id b13sm59938645wrn.28.2019.01.09.06.17.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jan 2019 06:17:21 -0800 (PST) From: Ilya Dryomov To: Ben Hutchings , Greg Kroah-Hartman Cc: stable@vger.kernel.org Subject: [PATCH 4.9] libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature() Date: Wed, 9 Jan 2019 15:17:09 +0100 Message-Id: <20190109141709.4921-1-idryomov@gmail.com> X-Mailer: git-send-email 2.14.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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(-) diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c index 29e23b5cb2ed..a4896e4a1c9a 100644 --- a/net/ceph/auth_x.c +++ b/net/ceph/auth_x.c @@ -804,7 +804,7 @@ static int calc_signature(struct ceph_x_authorizer *au, struct ceph_msg *msg, 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; -- 2.14.4