| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250831123602.14037-25-pali@kernel.org>
Date: Sun, 31 Aug 2025 14:35:51 +0200
From: Pali Rohár <pali@...nel.org>
To: Steve French <sfrench@...ba.org>,
Paulo Alcantara <pc@...guebit.com>,
ronnie sahlberg <ronniesahlberg@...il.com>
Cc: linux-cifs@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH 24/35] cifs: Add a new callback set_file_disp() for setting file disposition (delete pending state)
Implement it for all SMB dialects. It will be used by follow up changes.
Signed-off-by: Pali Rohár <pali@...nel.org>
---
fs/smb/client/cifsglob.h | 3 +++
fs/smb/client/smb1ops.c | 8 ++++++++
fs/smb/client/smb2ops.c | 11 +++++++++++
fs/smb/client/smb2pdu.c | 13 +++++++++++++
fs/smb/client/smb2proto.h | 2 ++
5 files changed, 37 insertions(+)
diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index 0ecf4988664e..7162b9120198 100644
--- a/fs/smb/client/cifsglob.h
+++ b/fs/smb/client/cifsglob.h
@@ -426,6 +426,9 @@ struct smb_version_operations {
/* set attributes */
int (*set_file_info)(struct inode *, const char *, FILE_BASIC_INFO *,
const unsigned int);
+ /* set file disposition (delete pending state) */
+ int (*set_file_disp)(const unsigned int xid, struct cifs_tcon *tcon,
+ struct cifs_fid *fid, bool delete_pending);
int (*set_compression)(const unsigned int, struct cifs_tcon *,
struct cifsFileInfo *);
/* check if we can send an echo or nor */
diff --git a/fs/smb/client/smb1ops.c b/fs/smb/client/smb1ops.c
index 73d3dc83faa6..e37104d3c5d7 100644
--- a/fs/smb/client/smb1ops.c
+++ b/fs/smb/client/smb1ops.c
@@ -1079,6 +1079,13 @@ smb_set_file_info(struct inode *inode, const char *full_path,
return rc;
}
+static int
+cifs_set_file_disp(const unsigned int xid, struct cifs_tcon *tcon,
+ struct cifs_fid *fid, bool delete_pending)
+{
+ return CIFSSMBSetFileDisposition(xid, tcon, delete_pending, fid->netfid, current->tgid);
+}
+
static int
cifs_set_compression(const unsigned int xid, struct cifs_tcon *tcon,
struct cifsFileInfo *cfile)
@@ -1391,6 +1398,7 @@ struct smb_version_operations smb1_operations = {
.set_path_size = CIFSSMBSetEOF,
.set_file_size = CIFSSMBSetFileSize,
.set_file_info = smb_set_file_info,
+ .set_file_disp = cifs_set_file_disp,
.set_compression = cifs_set_compression,
.echo = CIFSSMBEcho,
.mkdir = CIFSSMBMkDir,
diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index ad8947434b71..530e66fa4671 100644
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -1515,6 +1515,13 @@ smb2_close_getattr(const unsigned int xid, struct cifs_tcon *tcon,
return rc;
}
+static int
+smb2_set_file_disp(const unsigned int xid, struct cifs_tcon *tcon,
+ struct cifs_fid *fid, bool delete_pending)
+{
+ return SMB2_set_disp(xid, tcon, fid->persistent_fid, fid->volatile_fid, delete_pending);
+}
+
static int
SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid,
@@ -5310,6 +5317,7 @@ struct smb_version_operations smb20_operations = {
.set_path_size = smb2_set_path_size,
.set_file_size = smb2_set_file_size,
.set_file_info = smb2_set_file_info,
+ .set_file_disp = smb2_set_file_disp,
.set_compression = smb2_set_compression,
.mkdir = smb2_mkdir,
.mkdir_setinfo = smb2_mkdir_setinfo,
@@ -5413,6 +5421,7 @@ struct smb_version_operations smb21_operations = {
.set_path_size = smb2_set_path_size,
.set_file_size = smb2_set_file_size,
.set_file_info = smb2_set_file_info,
+ .set_file_disp = smb2_set_file_disp,
.set_compression = smb2_set_compression,
.mkdir = smb2_mkdir,
.mkdir_setinfo = smb2_mkdir_setinfo,
@@ -5520,6 +5529,7 @@ struct smb_version_operations smb30_operations = {
.set_path_size = smb2_set_path_size,
.set_file_size = smb2_set_file_size,
.set_file_info = smb2_set_file_info,
+ .set_file_disp = smb2_set_file_disp,
.set_compression = smb2_set_compression,
.mkdir = smb2_mkdir,
.mkdir_setinfo = smb2_mkdir_setinfo,
@@ -5635,6 +5645,7 @@ struct smb_version_operations smb311_operations = {
.set_path_size = smb2_set_path_size,
.set_file_size = smb2_set_file_size,
.set_file_info = smb2_set_file_info,
+ .set_file_disp = smb2_set_file_disp,
.set_compression = smb2_set_compression,
.mkdir = smb2_mkdir,
.mkdir_setinfo = smb2_mkdir_setinfo,
diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
index bf588ec99618..e05ddd446467 100644
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@ -5755,6 +5755,19 @@ SMB2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
0, 1, (void **)&buf, &len);
}
+int
+SMB2_set_disp(const unsigned int xid, struct cifs_tcon *tcon,
+ u64 persistent_fid, u64 volatile_fid, bool delete_pending)
+{
+ __u8 disp = delete_pending;
+ __u8 *buf = &disp;
+ unsigned int len = sizeof(disp);
+
+ return send_set_info(xid, tcon, persistent_fid, volatile_fid,
+ current->tgid, FILE_DISPOSITION_INFORMATION,
+ SMB2_O_INFO_FILE, 0, 1, (void **)&buf, &len);
+}
+
int
SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,
const u64 persistent_fid, const u64 volatile_fid,
diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h
index 6e805ece6a7b..d78ea3a6a5fb 100644
--- a/fs/smb/client/smb2proto.h
+++ b/fs/smb/client/smb2proto.h
@@ -249,6 +249,8 @@ extern int SMB2_set_acl(const unsigned int xid, struct cifs_tcon *tcon,
extern int SMB2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid,
struct smb2_file_full_ea_info *buf, int len);
+extern int SMB2_set_disp(const unsigned int xid, struct cifs_tcon *tcon,
+ u64 persistent_fid, u64 volatile_fid, bool delete_pending);
extern int SMB2_set_compression(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid);
extern int SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,
--
2.20.1
Powered by blists - more mailing lists