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

Commit 43b6535e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Don't declare inode uptodate unless all attributes were checked 



Fix a bug, whereby nfs_update_inode() was declaring the inode to be
up to date despite not having checked all the attributes.
The bug occurs because the temporary variable in which we cache
the validity information is 'sanitised' before reapplying to
nfsi->cache_validity.

Reported-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Cc: stable@vger.kernel.org # 3.5+
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 4dfc7fdb

fs/nfs/inode.c

+17 −9
Original line number Diff line number Diff line
@@ -1575,18 +1575,20 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			inode->i_version = fattr->change_attr;

		}

	} else if (server->caps & NFS_CAP_CHANGE_ATTR)

		invalid |= save_cache_validity;

		nfsi->cache_validity |= save_cache_validity;



	if (fattr->valid & NFS_ATTR_FATTR_MTIME) {

		memcpy(&inode->i_mtime, &fattr->mtime, sizeof(inode->i_mtime));

	} else if (server->caps & NFS_CAP_MTIME)

		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_ATTR

				| NFS_INO_REVAL_FORCED);



	if (fattr->valid & NFS_ATTR_FATTR_CTIME) {

		memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));

	} else if (server->caps & NFS_CAP_CTIME)

		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_ATTR

				| NFS_INO_REVAL_FORCED);



	/* Check if our cached file size is stale */
@@ -1608,7 +1610,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
					(long long)new_isize);

		}

	} else

		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_ATTR

				| NFS_INO_REVAL_PAGECACHE

				| NFS_INO_REVAL_FORCED);
@@ -1616,7 +1619,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	if (fattr->valid & NFS_ATTR_FATTR_ATIME)

		memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));

	else if (server->caps & NFS_CAP_ATIME)

		invalid |= save_cache_validity & (NFS_INO_INVALID_ATIME

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_ATIME

				| NFS_INO_REVAL_FORCED);



	if (fattr->valid & NFS_ATTR_FATTR_MODE) {
@@ -1627,7 +1631,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;

		}

	} else if (server->caps & NFS_CAP_MODE)

		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_ATTR

				| NFS_INO_INVALID_ACCESS

				| NFS_INO_INVALID_ACL

				| NFS_INO_REVAL_FORCED);
@@ -1638,7 +1643,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			inode->i_uid = fattr->uid;

		}

	} else if (server->caps & NFS_CAP_OWNER)

		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_ATTR

				| NFS_INO_INVALID_ACCESS

				| NFS_INO_INVALID_ACL

				| NFS_INO_REVAL_FORCED);
@@ -1649,7 +1655,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			inode->i_gid = fattr->gid;

		}

	} else if (server->caps & NFS_CAP_OWNER_GROUP)

		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_ATTR

				| NFS_INO_INVALID_ACCESS

				| NFS_INO_INVALID_ACL

				| NFS_INO_REVAL_FORCED);
@@ -1662,7 +1669,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			set_nlink(inode, fattr->nlink);

		}

	} else if (server->caps & NFS_CAP_NLINK)

		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_ATTR

				| NFS_INO_REVAL_FORCED);



	if (fattr->valid & NFS_ATTR_FATTR_SPACE_USED) {