From patchwork Tue Oct 2 23:58:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 10624193 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 20E5715E8 for ; Tue, 2 Oct 2018 23:58:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0003028553 for ; Tue, 2 Oct 2018 23:58:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7D542855D; Tue, 2 Oct 2018 23:58:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B1B328553 for ; Tue, 2 Oct 2018 23:58:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725976AbeJCGo1 (ORCPT ); Wed, 3 Oct 2018 02:44:27 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:45708 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725753AbeJCGo1 (ORCPT ); Wed, 3 Oct 2018 02:44:27 -0400 Received: by mail-pl1-f195.google.com with SMTP id y15-v6so2509027plr.12 for ; Tue, 02 Oct 2018 16:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=e9Em9VbiB7+Ve43jO3ZJfPClG+6yT97/UTF6eQVn0xU=; b=AuW87WLmMhs2+stW+hZ5UPnQkGbyoBunYPrN22lYyBKGsubO5Dti3pDDktH2liauge tK/EhXs+xB4AFHKamARpBqBEgd0Nm3YC06uoS5ZXtxp5a2PVCVCdnmfwZUJYGlnbAS2D +ue3HedrFwGtdbvVMmMcA0Aifq2CSnZTkT0rX3a5dG4W/T0I8zaQawXBvihv1QY/oWSv GIWQFHBaDF5Cy0zgG9TIPrIiiH8p2lLl8vdGTwm0TdcE+vZzzut2Cu2LsVFK3+RUtvje SrIB92ZoN5SzQyjMKJh2/IN9Tdx9Chhb8M5qiW+T2LzfplwezXP9BpmvJhC32NloQZXa XVAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=e9Em9VbiB7+Ve43jO3ZJfPClG+6yT97/UTF6eQVn0xU=; b=EFrlkvB0bFURZwK361XS8yJ2x9udM2Vt167LTfpchmY2Tsie8CPhGItd2W0Q4evUJB /4BTZKdMp8mcaNrZeh41EvrLJUQthqCCL+wqPoG/q2O7VojKFnbCvO+8x6sm9CRvRL37 9VJgmO0piO1kqCrUxwWE6X9qFeK7aoq9GB5VQX6diYhu/bjUQdomOk8jtudMSHvn6kbU pstEkVXb/BjRb0m1NrqHNYjD6BwbwOuHg2GeuyiHMF+xnudgMdRBvQpXBlkvwJYOkfZa UdCEKz+PJkpdAPI8LIj4k3kAvHMGqMBHq7FvF7vJxQX1ub18nkif8ubH/VO4QWlOV1pT NYTw== X-Gm-Message-State: ABuFfoiXltOAVnbqmhwcjNnofkBVszi1EK9vT3NpJTT42EcoERKvBJzv pep0kT0ushLLvg1nWuCYwHfPmdBZER2L9CO0byXiW/fR X-Google-Smtp-Source: ACcGV60lO4kY7mbGgPBkN0mhtj++SXQKif88xUYwTmV9O0VsZHpVGFvvkkG9RO7XSTDReAg/3aouaMnletoTYY3czCI= X-Received: by 2002:a17:902:bd85:: with SMTP id q5-v6mr2722611pls.73.1538524713399; Tue, 02 Oct 2018 16:58:33 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Tue, 2 Oct 2018 18:58:21 -0500 Message-ID: Subject: Updated fixes for compounding regression To: CIFS , Pavel Shilovskiy , ronnie sahlberg , =?utf-8?q?Aur=C3=A9lien_Aptel?= Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Have updated for-next with Aurelien's fix for stable and the fixes for compounding regression (including for Pavel's suggestion on the lease break issue). See below ---------------------------------- smb3: fix lease break problem introduced by compounding Fixes problem (discovered by Aurelien) introduced by recent commit: commit b24df3e30cbf48255db866720fb71f14bf9d2f39 ("cifs: update receive_encrypted_standard to handle compounded responses") which broke the ability to respond to some lease breaks (lease breaks being ignored is a problem since can block server response for duration of the lease break timeout). Signed-off-by: Steve French Reviewed-by: Ronnie Sahlberg Reviewed-by: Pavel Shilovsky Reviewed-by: Ronnie Sahlberg Signed-off-by: Steve French Reviewed-by: Ronnie Sahlberg Reviewed-by: Pavel Shilovsky --- fs/cifs/connect.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) From 7af929d6d05ba5564139718e30d5bc96bdbc716a Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 2 Oct 2018 18:54:09 -0500 Subject: [PATCH 4/4] smb3: fix lease break problem introduced by compounding Fixes problem (discovered by Aurelien) introduced by recent commit: commit b24df3e30cbf48255db866720fb71f14bf9d2f39 ("cifs: update receive_encrypted_standard to handle compounded responses") which broke the ability to respond to some lease breaks (lease breaks being ignored is a problem since can block server response for duration of the lease break timeout). Signed-off-by: Steve French Reviewed-by: Ronnie Sahlberg Reviewed-by: Pavel Shilovsky --- fs/cifs/connect.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index e9d64c92b8da..52d71b64c0c6 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -946,8 +946,7 @@ cifs_demultiplex_thread(void *p) } else { mids[0] = server->ops->find_mid(server, buf); bufs[0] = buf; - if (mids[0]) - num_mids = 1; + num_mids = 1; if (!mids[0] || !mids[0]->receive) length = standard_receive3(server, mids[0]); -- 2.17.1