Fix three Oopsable conditions in the 2.6.18-rc7 NFS client
Hi Linus,
Please pull from the 'fixes' branch of the repository at
git pull git://git.linux-nfs.org/pub/linux/nfs-2.6.git fixes
This will update the following files through the appended changesets.
Cheers,
Trond
----
fs/nfs/nfs4proc.c | 6 +++--- fs/nfs/read.c | 6 ++++-- fs/nfs/write.c | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-)
commit 5c2d97cb31fb77981797fec46230ca005b865799
Author: Trond Myklebust <[email protected]> Date: Mon Sep 18 23:20:35 2006 -0400
NFS: Fix nfs_page use after free issues in fs/nfs/write.c
Signed-off-by Trond Myklebust <[email protected]>
commit 76723de0cf5b186afe2f329eeef304c321d52bf8
Author: Trond Myklebust <[email protected]> Date: Fri Sep 15 08:11:51 2006 -0400
NFSv4: Fix incorrect semaphore release in _nfs4_do_open()
Signed-off-by Trond Myklebust <[email protected]>
commit 7a52411107e1ac8f5be6967936ec237f40a1c7e4
Author: Trond Myklebust <[email protected]> Date: Fri Sep 15 16:03:45 2006 -0400
NFS: Fix Oopsable condition in nfs_readpage_sync()
Signed-off-by Trond Myklebust <[email protected]>
fs/nfs/nfs4proc.c +3 -3
@@ -970,7 +970,7 @@ static int _nfs4_do_open(struct inode *d status = -ENOMEM ; opendata =nfs4_opendata_alloc (dentry, sp, flags, sattr);if (opendata ==NULL ) - goto err_put_state_owner; + goto err_release_rwsem; status =_nfs4_proc_open (opendata);if (status !=0 )
@@ -989,11 +989,11 @@ static int _nfs4_do_open(struct inode *dreturn 0 ; err_opendata_free:nfs4_opendata_free (opendata); +err_release_rwsem: +up_read (&clp->cl_sem); err_put_state_owner:nfs4_put_state_owner (sp); out_err: -/* Note: clp->cl_sem must be released before nfs4_put_open_state()! */ -up_read (&clp->cl_sem); *res =NULL ;return status; }
fs/nfs/read.c +4 -2
@@ -204,9 +204,11 @@ static int nfs_readpage_sync(struct nfs_NFS_I (inode)->cache_validity |=NFS_INO_INVALID_ATIME ;spin_unlock (&inode->i_lock); -nfs_readpage_truncate_uninitialised_page (rdata); -if (rdata->res.eof || rdata->res.count == rdata->args.count) +if (rdata->res.eof || rdata->res.count == rdata->args.count) {SetPageUptodate (page); +if (rdata->res.eof && count !=0 ) +memclear_highpage_flush (page, rdata->args.pgbase, count); + } result =0 ; io_error:
fs/nfs/write.c +2 -2
@@ -590,8 +590,8 @@ static void nfs_cancel_commit_list(struc req =nfs_list_entry (head->next);nfs_list_remove_request (req);nfs_inode_remove_request (req); -nfs_clear_page_writeback (req);dec_zone_page_state (req->wb_page,NR_UNSTABLE_NFS ); +nfs_clear_page_writeback (req); } }
@@ -1386,8 +1386,8 @@ nfs_commit_list(struct inode *inode, str req =nfs_list_entry (head->next);nfs_list_remove_request (req);nfs_mark_request_commit (req); -nfs_clear_page_writeback (req);dec_zone_page_state (req->wb_page,NR_UNSTABLE_NFS ); +nfs_clear_page_writeback (req); }return -ENOMEM ; }