From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C42D658E2AF; Wed, 9 Sep 2026 14:39:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788964793; cv=none; b=fD81u6Gr/tYKgsJtcfLGP4lTy6tI0AMqPNc9cQlZAD5Mv6jekJy1R57qSeqT1rYY5V0iqkXzGweQImSNgibHCcEtK83AGNaR/1UQnw6NDE2COHN+CcNvMfPqp/fwAgHCi/cksbEhhD7yd5QdBU7AxIWfTPLHkhceenWC4CcyEDE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788964793; c=relaxed/simple; bh=uktFxn/dLusLaAFVcDhWitdHYF/q0C9RCqYYGitzvX0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XC6CGJix1GghpORW3z/wb/83jhEuHYjFH0TcMqtpgm4qvCXtOp2PCvRQYPLIG3a+NFXpKcffDIGyvPACzJb7X3AQ74LNEnu+AxyJdA7Cjx55yXGp/Uqo7MBMbx2oBI+avzlcZ0+NC55eVgV9SxgbzkBPgZY+Qg7cXRhsad3Mokk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wx0Io95P; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wx0Io95P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F3191F00A3A; Wed, 9 Sep 2026 14:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788964791; bh=+vzayxDARd1SXvo16sB9HP0oKlDUf4B2XS9wJdArTh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wx0Io95PB/ca2an9uDVZsPWfLAnompOFkyRZVygxmfg5MvsO+ti5pmrPgbzyWoxCm l3L/Z1U9+JMaD/G6zYavI8KOqy7EJomlY0Vj/7ynt5A6a8l6vbUluQ6vyl44aQHelA sAsOLSSWK2EQrXBacj/ABxynNSeA8zTDy/HpCoa0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , Steve French , Paulo Alcantara , Enzo Matsumiya , linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Steve French , Sasha Levin Subject: [PATCH 6.18 544/583] cifs: SMB1 split: Create smb1proto.h for SMB1 declarations Date: Wed, 9 Sep 2026 15:43:49 +0200 Message-ID: <20260909134256.592350564@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909134237.773280130@linuxfoundation.org> References: <20260909134237.773280130@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells [ Upstream commit 86c666506ea2c42649879eeac7f29e7bedef2f23 ] Signed-off-by: David Howells cc: Steve French cc: Paulo Alcantara cc: Enzo Matsumiya cc: linux-cifs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-kernel@vger.kernel.org Acked-by: Enzo Matsumiya Signed-off-by: Steve French Stable-dep-of: 730d0bb19507 ("smb: client: fix UAF and buffer leak in cifs_check_trans2() for malformed secondary T2") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/smb/client/cifsglob.h | 2 -- fs/smb/client/cifsproto.h | 11 +---------- fs/smb/client/smb1proto.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 fs/smb/client/smb1proto.h --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -2110,8 +2110,6 @@ extern mempool_t cifs_io_subrequest_pool /* Operations for different SMB versions */ #ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY -extern struct smb_version_operations smb1_operations; -extern struct smb_version_values smb1_values; extern struct smb_version_operations smb20_operations; extern struct smb_version_values smb20_values; #endif /* CIFS_ALLOW_INSECURE_LEGACY */ --- a/fs/smb/client/cifsproto.h +++ b/fs/smb/client/cifsproto.h @@ -14,6 +14,7 @@ #ifdef CONFIG_CIFS_DFS_UPCALL #include "dfs_cache.h" #endif +#include "smb1proto.h" struct statfs; struct smb_rqst; @@ -430,16 +431,6 @@ extern int CIFSSMBSetFileSize(const unsi struct cifsFileInfo *cfile, __u64 size, bool set_allocation); -struct cifs_unix_set_info_args { - __u64 ctime; - __u64 atime; - __u64 mtime; - __u64 mode; - kuid_t uid; - kgid_t gid; - dev_t device; -}; - extern int CIFSSMBUnixSetFileInfo(const unsigned int xid, struct cifs_tcon *tcon, const struct cifs_unix_set_info_args *args, --- /dev/null +++ b/fs/smb/client/smb1proto.h @@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ +/* + * + * Copyright (c) International Business Machines Corp., 2002,2008 + * Author(s): Steve French (sfrench@us.ibm.com) + * + */ +#ifndef _SMB1PROTO_H +#define _SMB1PROTO_H + +struct cifs_unix_set_info_args { + __u64 ctime; + __u64 atime; + __u64 mtime; + __u64 mode; + kuid_t uid; + kgid_t gid; + dev_t device; +}; + +#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY + +/* + * cifssmb.c + */ + +/* + * smb1ops.c + */ +extern struct smb_version_operations smb1_operations; +extern struct smb_version_values smb1_values; + +/* + * smb1transport.c + */ + +#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */ +#endif /* _SMB1PROTO_H */