Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp3487375pxb; Mon, 4 Apr 2022 18:33:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzU7a/GKQLIQD9WQIQqdmoX0CMNsePQenp2PecYFk616eLfOTs5nAi7aa03DeIjey9ODukD X-Received: by 2002:a17:902:e883:b0:153:f7b8:fa9 with SMTP id w3-20020a170902e88300b00153f7b80fa9mr978596plg.96.1649122433477; Mon, 04 Apr 2022 18:33:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649122433; cv=none; d=google.com; s=arc-20160816; b=ckxHdcJHz8LEb2D8O70xe4Q7uSpuxp174xhMDHI/8NqWGZr/Ke6r5EH4JOUvA8sXzi X6oSJMM3urlnv6LpDLipjI2c39WRuyFI++Q1FvlpU3RHZM2nMU+ok1wAdcwNlxLyKjz0 dm0+tbnUrMkeNw7/2KPBCrwxCe086ChXMBqPo47u+pjbZFZCxAZUweZdHchZmnG8foXx N7yixJy/BXCW7i5Q2XSpMvTf9ciGGU2h3RMXtDO8Qf11vXAYK2PDcfe8qdp3xi/bZ1DN OU6V0d8iPcJC6u88Q0vSwuFq8exBTjiRMdazqEBnxlTkvGSpiBl78Tac370x9RePHw9g zwRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:mime-version :dkim-signature; bh=XbXCNFwHHw/7AcxBigwapuOKfyDexeoHFsZgqSWyus4=; b=FhtyBXDOZod22bZGKKqhtjG/TjQdTQu3hAl/ehDznC92g+dKrfIe4pk8npFdla9bMA Znw76P71OFLJmiqnA4/a0NQxvx8yqT6JcuHLqxUt0leHAT7SHjmJNHKJ+HjkHx+JI/3q D/wjHEPOm++wB8WGVur+Wp0ITlrcr89Mx+IWfItsFg92KWF0q/6hvTaTtSYsic9Vt9vl 7Yt7Hp6lxHaZwd0nXEqkjb78Ikvu7md6owD1B3nx2xc6qMZbNDzmih7Qe62Snsx0hJyQ 32jNUhaCzmTwyZMxsEB6hiuGp95uxHkcNLPWk/WwUg9DBhq1e4jlXFcBGb5Uq+4N+uQQ ZY0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=A7Qi+5s7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id u11-20020a170902e5cb00b001541c9df632si13072787plf.400.2022.04.04.18.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 18:33:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=A7Qi+5s7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4292A7EB35; Mon, 4 Apr 2022 17:26:17 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348312AbiDAQi5 (ORCPT + 99 others); Fri, 1 Apr 2022 12:38:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350198AbiDAQiA (ORCPT ); Fri, 1 Apr 2022 12:38:00 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 561551017E0; Fri, 1 Apr 2022 09:15:43 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id m3so5764096lfj.11; Fri, 01 Apr 2022 09:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to:cc; bh=XbXCNFwHHw/7AcxBigwapuOKfyDexeoHFsZgqSWyus4=; b=A7Qi+5s7OShNNKc36z53P4uDvpSQu+/hqp7p5j1TVC27Ytu91DmHq7N7yvw/woHrbm +XzmvxLEHwkNXGhttQI3+hE3X6mKE5l783VNROkI30aZGhsmAD9wnqu2YnvOqFvEsTBK fuM+1wVvd49XNC5ogu2AOOMp6PPaxUqnrPUjB5yMqyySWTAlVxHlFVmkblyFLjwS4IxE F9BSSvnNw5mpNNvv8ivgtlcEdmU5h/KtZxnrQGwXgMD462mfr2oBz/qiFQ13kXxBSwUB ENo654fYGP2/6zYAzv4XyAx+5sCSAZdSHoyP524DobpjEdNuhRz753X3X9piFroCpOSD hPiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=XbXCNFwHHw/7AcxBigwapuOKfyDexeoHFsZgqSWyus4=; b=kgJASmoLD4qm/HcKyitbBVFG+ZamBnYByFc5oNOTHw76I0OFYMERqI80MADhLQTHH1 i7wixJjTF7NVpRUT0/VAtn7g2N6cTm5KF9M0lRvtZPNf+Nn1tAUhdvW4uDoF8FSBlBc4 q7WX/VDYVYKVXoDMOltOZUwcwcMei+wjQeDhcr/y0YLWvywcPThCRKEHIZMSDoZXmbq2 QV7nj6F40ZWn9ChWeV5SeO+6Foaom5SoRapyNwGnvIwcjSc+QOvlYTR9S4kpgotM3glb yrz7jMCAVS+6Q9HTjrSHMJYuOOIYktQR688AUYz9ypon7VlbFlzk/QdhbnM+sJPYt/z5 EPYw== X-Gm-Message-State: AOAM530P40cxZ7zFoop41nyJ5pe2k2dYAbGHJlSYsYEfutF82OObdNuQ RwLOTvQ6zR6RocUTrj1UoDb+onHWAWNUVfVacfMa/bRYGyY= X-Received: by 2002:a05:6512:33c3:b0:44a:8067:7ec4 with SMTP id d3-20020a05651233c300b0044a80677ec4mr14736397lfg.601.1648829741242; Fri, 01 Apr 2022 09:15:41 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Fri, 1 Apr 2022 11:15:30 -0500 Message-ID: Subject: [GIT PULL] cifs/smb3 fixes To: Linus Torvalds Cc: LKML , CIFS Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Please pull the following changes since commit dca65818c80cf06e0f08ba2cf94060a5236e73c2: cifs: use a different reconnect helper for non-cifsd threads (2022-03-18 23:12:03 -0500) are available in the Git repository at: git://git.samba.org/sfrench/cifs-2.6.git tags/5.18-smb3-fixes-part2 for you to fetch changes up to d6f5e358452479fa8a773b5c6ccc9e4ec5a20880: cifs: fix NULL ptr dereference in smb2_ioctl_query_info() (2022-03-31 09:39:58 -0500) ---------------------------------------------------------------- 14 fixes to cifs client and to smbfs_common code (used by both cifs.ko client and ksmbd server), 4 for stable - three fixes for big endian issues in how Persistent and Volatile file ids were stored - Various misc. fixes: including some for oops, 2 for ioctls, 1 for writeback - cleanup of how tcon (tree connection) status is tracked - Four changesets to move various duplicated protocol definitions (defined both in cifs.ko and ksmbd) into smbfs_common/smb2pdu.h - important performance improvement to use cached handles in some key compounding code paths (reduces numbers of opens/closes sent in some workloads) - fix to allow alternate DFS target to be used to retry on a failed i/o There is a trivial merge conflict (fixed in linux-next) with recent upstream commit: " 5224f7909617 ("treewide: Replace zero-length arrays with flexible-array members")" . Here is a link to a rebased version that resolves the conflict if you prefer using this: git://git.samba.org/sfrench/cifs-2.6.git tags/5.18-rc-rebased-cifs-merge ---------------------------------------------------------------- David Howells (1): cifs: writeback fix Paulo Alcantara (5): cifs: do not skip link targets when an I/O fails cifs: fix bad fids sent over wire ksmbd: store fids as opaque u64 integers cifs: prevent bad output lengths in smb2_ioctl_query_info() cifs: fix NULL ptr dereference in smb2_ioctl_query_info() Ronnie Sahlberg (2): cifs: convert the path to utf16 in smb2_query_info_compound cifs: change smb2_query_info_compound to use a cached fid, if available Steve French (5): [smb3] move more common protocol header definitions to smbfs_common smb3: move defines for ioctl protocol header and SMB2 sizes to smbfs_common smb3: move defines for query info and query fsinfo to smbfs_common smb3: cleanup and clarify status of tree connections smb3: fix ksmbd bigendian bug in oplock break, and move its struct to smbfs_common Xiaomeng Tong (1): cifs: fix incorrect use of list iterator after the loop fs/cifs/cifs_debug.c | 2 +- fs/cifs/cifsfs.c | 4 +- fs/cifs/cifsglob.h | 24 +-- fs/cifs/cifspdu.h | 14 +- fs/cifs/cifssmb.c | 11 +- fs/cifs/connect.c | 46 +++-- fs/cifs/file.c | 8 +- fs/cifs/misc.c | 2 +- fs/cifs/smb2glob.h | 11 -- fs/cifs/smb2misc.c | 14 +- fs/cifs/smb2ops.c | 246 +++++++++++++---------- fs/cifs/smb2pdu.c | 73 ++++--- fs/cifs/smb2pdu.h | 560 +--------------------------------------------------- fs/cifs/smb2proto.h | 2 +- fs/ksmbd/oplock.c | 4 +- fs/ksmbd/smb2pdu.c | 108 +++++----- fs/ksmbd/smb2pdu.h | 533 +------------------------------------------------- fs/smbfs_common/smb2pdu.h | 639 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 18 files changed, 924 insertions(+), 1377 deletions(-) -- Thanks, Steve