GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-07 23:11:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nfs: reject changes to resvport and sharecache during remount

Browse source 
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: Scott 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: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Scott Mayhew 2014-08-04 17:37:27 -04:00 • committed by Trond Myklebust
parent 5b53dc88b0
commit 71a6ec8ac5
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fs/nfs/super.c
View file

@ -2179,7 +2179,7 @@ out_no_address:
return -EINVAL; return -EINVAL;
} }
#define NFS_MOUNT_CMP_FLAGMASK ~(NFS_MOUNT_INTR \ #define NFS_REMOUNT_CMP_FLAGMASK ~(NFS_MOUNT_INTR \
| NFS_MOUNT_SECURE \ | NFS_MOUNT_SECURE \
| NFS_MOUNT_TCP \ | NFS_MOUNT_TCP \
| NFS_MOUNT_VER3 \ | NFS_MOUNT_VER3 \
@ -2187,15 +2187,16 @@ out_no_address:
| NFS_MOUNT_NONLM \ | NFS_MOUNT_NONLM \
| NFS_MOUNT_BROKEN_SUID \ | NFS_MOUNT_BROKEN_SUID \
| NFS_MOUNT_STRICTLOCK \ | NFS_MOUNT_STRICTLOCK \
| NFS_MOUNT_UNSHARED \
| NFS_MOUNT_NORESVPORT \
| NFS_MOUNT_LEGACY_INTERFACE) | NFS_MOUNT_LEGACY_INTERFACE)
#define NFS_MOUNT_CMP_FLAGMASK (NFS_REMOUNT_CMP_FLAGMASK & \
~(NFS_MOUNT_UNSHARED | NFS_MOUNT_NORESVPORT))
static int static int
nfs_compare_remount_data(struct nfs_server *nfss, nfs_compare_remount_data(struct nfs_server *nfss,
struct nfs_parsed_mount_data *data) 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->rsize != nfss->rsize ||
data->wsize != nfss->wsize || data->wsize != nfss->wsize ||
data->version != nfss->nfs_client->rpc_ops->version || data->version != nfss->nfs_client->rpc_ops->version ||