Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71a6ec8a authored by Scott Mayhew's avatar Scott Mayhew Committed by Trond Myklebust
Browse files

nfs: reject changes to resvport and sharecache during remount 



Commit c8e47028 made it possible to change resvport/noresvport and
sharecache/nosharecache via a remount operation, neither of which should be
allowed.

Signed-off-by: default avatarScott Mayhew <smayhew@redhat.com>
Fixes: c8e47028 (nfs: Apply NFS_MOUNT_CMP_FLAGMASK to nfs_compare_remount_data)
Cc: stable@vger.kernel.org # 3.16+
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 5b53dc88

fs/nfs/super.c

+5 −4
Original line number Diff line number Diff line
@@ -2179,7 +2179,7 @@ static int nfs_validate_text_mount_data(void *options, 
	return -EINVAL;

}



#define NFS_MOUNT_CMP_FLAGMASK ~(NFS_MOUNT_INTR \

#define NFS_REMOUNT_CMP_FLAGMASK ~(NFS_MOUNT_INTR \

		| NFS_MOUNT_SECURE \

		| NFS_MOUNT_TCP \

		| NFS_MOUNT_VER3 \
@@ -2187,15 +2187,16 @@ static int nfs_validate_text_mount_data(void *options, 
		| NFS_MOUNT_NONLM \

		| NFS_MOUNT_BROKEN_SUID \

		| NFS_MOUNT_STRICTLOCK \

		| NFS_MOUNT_UNSHARED \

		| NFS_MOUNT_NORESVPORT \

		| NFS_MOUNT_LEGACY_INTERFACE)



#define NFS_MOUNT_CMP_FLAGMASK (NFS_REMOUNT_CMP_FLAGMASK & \

		~(NFS_MOUNT_UNSHARED | NFS_MOUNT_NORESVPORT))



static int

nfs_compare_remount_data(struct nfs_server *nfss,

			 struct nfs_parsed_mount_data *data)

{

	if ((data->flags ^ nfss->flags) & NFS_MOUNT_CMP_FLAGMASK ||

	if ((data->flags ^ nfss->flags) & NFS_REMOUNT_CMP_FLAGMASK ||

	    data->rsize != nfss->rsize ||

	    data->wsize != nfss->wsize ||

	    data->version != nfss->nfs_client->rpc_ops->version ||