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=-6.0 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 EB973C282C7 for ; Tue, 29 Jan 2019 11:47:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0ED6214DA for ; Tue, 29 Jan 2019 11:47:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548762424; bh=9rvy04bQqT1FbTOnMUwSMNKx+RtVaJhKa8zZ07SS8yU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=It+hcCDDbbhWtVHOPOapRDsZ8T+2rqhts+duAb0fbm5EiHvtVm6h9zPGEJE5B0iWz dfbSLprFCWdUZJNQYaODVHDzqyZGE2zhGToxSvr8Hl3YhDxXCHv9Rm66yRZZcHwZm2 UalyAjuREhJ6r24FxdgOn8exCe4STdMnjhItwFl4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731119AbfA2LrD (ORCPT ); Tue, 29 Jan 2019 06:47:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:37602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729724AbfA2Lq5 (ORCPT ); Tue, 29 Jan 2019 06:46:57 -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 255AE214DA; Tue, 29 Jan 2019 11:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548762416; bh=9rvy04bQqT1FbTOnMUwSMNKx+RtVaJhKa8zZ07SS8yU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QvBgIcNNMa3F3Y1/clU9DBubsxDsQbTL1P80LTyJJZle6QRxknBfeFcvBV6/urupZ wzDbcNGVUppVETfQtpWfK3mkU20jnVga5hGiMe0hfRyKJ08wuDTo3I25eGBucX+q3E yQ4PN8UowKTK+qjE02kTj9BMb6HllLNkkB3uUBe0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ronnie Sahlberg , Pavel Shilovsky , Steve French Subject: [PATCH 4.19 057/103] smb3: add credits we receive from oplock/break PDUs Date: Tue, 29 Jan 2019 12:35:34 +0100 Message-Id: <20190129113204.109239414@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129113159.567154026@linuxfoundation.org> References: <20190129113159.567154026@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ronnie Sahlberg commit 2e5700bdde438ed708b36d8acd0398dc73cbf759 upstream. Otherwise we gradually leak credits leading to potential hung session. Signed-off-by: Ronnie Sahlberg CC: Stable Reviewed-by: Pavel Shilovsky Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2misc.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/fs/cifs/smb2misc.c +++ b/fs/cifs/smb2misc.c @@ -648,6 +648,13 @@ smb2_is_valid_oplock_break(char *buffer, if (rsp->sync_hdr.Command != SMB2_OPLOCK_BREAK) return false; + if (rsp->sync_hdr.CreditRequest) { + spin_lock(&server->req_lock); + server->credits += le16_to_cpu(rsp->sync_hdr.CreditRequest); + spin_unlock(&server->req_lock); + wake_up(&server->request_q); + } + if (rsp->StructureSize != smb2_rsp_struct_sizes[SMB2_OPLOCK_BREAK_HE]) { if (le16_to_cpu(rsp->StructureSize) == 44)