summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust2006-09-19 05:20:35 +0200
committerTrond Myklebust2006-09-19 17:59:10 +0200
commit5c2d97cb31fb77981797fec46230ca005b865799 (patch)
tree8393101586bc3ed4e7577eeae215fc305b1999de
parentNFSv4: Fix incorrect semaphore release in _nfs4_do_open() (diff)
downloadkernel-qcow2-linux-5c2d97cb31fb77981797fec46230ca005b865799.tar.gz
kernel-qcow2-linux-5c2d97cb31fb77981797fec46230ca005b865799.tar.xz
kernel-qcow2-linux-5c2d97cb31fb77981797fec46230ca005b865799.zip
NFS: Fix nfs_page use after free issues in fs/nfs/write.c
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/write.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 8ab3cf10d792..7084ac9a6455 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -590,8 +590,8 @@ static void nfs_cancel_commit_list(struct list_head *head)
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, struct list_head *head, int how)
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;
}