Commit 82e9367c authored by Steve French's avatar Steve French
Browse files

smb3: Add new parm "nodelete" 



In order to handle workloads where it is important to make sure that
a buggy app did not delete content on the drive, the new mount option
"nodelete" allows standard permission checks on the server to work,
but prevents on the client any attempts to unlink a file or delete
a directory on that mount point.  This can be helpful when running
a little understood app on a network mount that contains important
content that should not be deleted.

Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
parent b2ca6c2c

fs/cifs/cifsfs.c

+2 −0
Original line number Diff line number Diff line
@@ -534,6 +534,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
		seq_puts(s, ",signloosely");

	if (tcon->nocase)

		seq_puts(s, ",nocase");

	if (tcon->nodelete)

		seq_puts(s, ",nodelete");

	if (tcon->local_lease)

		seq_puts(s, ",locallease");

	if (tcon->retry)

fs/cifs/cifsglob.h

+2 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ struct smb_vol { 
	bool override_gid:1;

	bool dynperm:1;

	bool noperm:1;

	bool nodelete:1;

	bool mode_ace:1;

	bool no_psx_acl:1; /* set if posix acl support should be disabled */

	bool cifs_acl:1;
@@ -1136,6 +1137,7 @@ struct cifs_tcon { 
	bool retry:1;

	bool nocase:1;

	bool nohandlecache:1; /* if strange server resource prob can turn off */

	bool nodelete:1;

	bool seal:1;      /* transport encryption for this mounted share */

	bool unix_ext:1;  /* if false disable Linux extensions to CIFS protocol

				for this mount even if server would support */

fs/cifs/connect.c

+8 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ enum { 
	Opt_forceuid, Opt_noforceuid,

	Opt_forcegid, Opt_noforcegid,

	Opt_noblocksend, Opt_noautotune, Opt_nolease,

	Opt_hard, Opt_soft, Opt_perm, Opt_noperm,

	Opt_hard, Opt_soft, Opt_perm, Opt_noperm, Opt_nodelete,

	Opt_mapposix, Opt_nomapposix,

	Opt_mapchars, Opt_nomapchars, Opt_sfu,

	Opt_nosfu, Opt_nodfs, Opt_posixpaths,
@@ -141,6 +141,7 @@ static const match_table_t cifs_mount_option_tokens = { 
	{ Opt_soft, "soft" },

	{ Opt_perm, "perm" },

	{ Opt_noperm, "noperm" },

	{ Opt_nodelete, "nodelete" },

	{ Opt_mapchars, "mapchars" }, /* SFU style */

	{ Opt_nomapchars, "nomapchars" },

	{ Opt_mapposix, "mapposix" }, /* SFM style */
@@ -1760,6 +1761,9 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
		case Opt_noperm:

			vol->noperm = 1;

			break;

		case Opt_nodelete:

			vol->nodelete = 1;

			break;

		case Opt_mapchars:

			vol->sfu_remap = true;

			vol->remap = false; /* disable SFM mapping */
@@ -3362,6 +3366,8 @@ static int match_tcon(struct cifs_tcon *tcon, struct smb_vol *volume_info) 
		return 0;

	if (tcon->no_lease != volume_info->no_lease)

		return 0;

	if (tcon->nodelete != volume_info->nodelete)

		return 0;

	return 1;

}
@@ -3597,6 +3603,7 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb_vol *volume_info) 
	tcon->retry = volume_info->retry;

	tcon->nocase = volume_info->nocase;

	tcon->nohandlecache = volume_info->nohandlecache;

	tcon->nodelete = volume_info->nodelete;

	tcon->local_lease = volume_info->local_lease;

	INIT_LIST_HEAD(&tcon->pending_opens);

fs/cifs/inode.c

+11 −0
Original line number Diff line number Diff line
@@ -1418,6 +1418,11 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry) 


	xid = get_xid();



	if (tcon->nodelete) {

		rc = -EACCES;

		goto unlink_out;

	}



	/* Unlink can be called from rename so we can not take the

	 * sb->s_vfs_rename_mutex here */

	full_path = build_path_from_dentry(dentry);
@@ -1746,6 +1751,12 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry) 
		goto rmdir_exit;

	}



	if (tcon->nodelete) {

		rc = -EACCES;

		cifs_put_tlink(tlink);

		goto rmdir_exit;

	}



	rc = server->ops->rmdir(xid, tcon, full_path, cifs_sb);

	cifs_put_tlink(tlink);

CRA Git | Maintained and supported by SUSTech CRA and CCSE