Commit 21776fa3 authored by Dave Kleikamp's avatar Dave Kleikamp

JFS: [CHECKER] if txCommit fails, don't call d_instantiate

In several functions, d_instantiate is called before the transaction
is committed.  Under the rare condition that txCommit fails, the new
inode is released, but the dentry continues to point to it.  This
can lead to a seg fault.  The fix is to call d_instantiate after
txCommit has run successfully.
parent 70e17f40
...@@ -135,7 +135,6 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode, ...@@ -135,7 +135,6 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
insert_inode_hash(ip); insert_inode_hash(ip);
mark_inode_dirty(ip); mark_inode_dirty(ip);
d_instantiate(dentry, ip);
dip->i_ctime = dip->i_mtime = CURRENT_TIME; dip->i_ctime = dip->i_mtime = CURRENT_TIME;
...@@ -150,7 +149,8 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode, ...@@ -150,7 +149,8 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
if (rc) { if (rc) {
ip->i_nlink = 0; ip->i_nlink = 0;
iput(ip); iput(ip);
} } else
d_instantiate(dentry, ip);
out2: out2:
free_UCSname(&dname); free_UCSname(&dname);
...@@ -265,7 +265,6 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode) ...@@ -265,7 +265,6 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
insert_inode_hash(ip); insert_inode_hash(ip);
mark_inode_dirty(ip); mark_inode_dirty(ip);
d_instantiate(dentry, ip);
/* update parent directory inode */ /* update parent directory inode */
dip->i_nlink++; /* for '..' from child directory */ dip->i_nlink++; /* for '..' from child directory */
...@@ -281,7 +280,8 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode) ...@@ -281,7 +280,8 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
if (rc) { if (rc) {
ip->i_nlink = 0; ip->i_nlink = 0;
iput(ip); iput(ip);
} } else
d_instantiate(dentry, ip);
out2: out2:
free_UCSname(&dname); free_UCSname(&dname);
...@@ -806,12 +806,14 @@ static int jfs_link(struct dentry *old_dentry, ...@@ -806,12 +806,14 @@ static int jfs_link(struct dentry *old_dentry,
ip->i_ctime = CURRENT_TIME; ip->i_ctime = CURRENT_TIME;
mark_inode_dirty(dir); mark_inode_dirty(dir);
atomic_inc(&ip->i_count); atomic_inc(&ip->i_count);
d_instantiate(dentry, ip);
iplist[0] = ip; iplist[0] = ip;
iplist[1] = dir; iplist[1] = dir;
rc = txCommit(tid, 2, &iplist[0], 0); rc = txCommit(tid, 2, &iplist[0], 0);
if (!rc)
d_instantiate(dentry, ip);
free_dname: free_dname:
free_UCSname(&dname); free_UCSname(&dname);
...@@ -999,7 +1001,6 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, ...@@ -999,7 +1001,6 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
insert_inode_hash(ip); insert_inode_hash(ip);
mark_inode_dirty(ip); mark_inode_dirty(ip);
d_instantiate(dentry, ip);
/* /*
* commit update of parent directory and link object * commit update of parent directory and link object
...@@ -1028,7 +1029,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, ...@@ -1028,7 +1029,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
if (rc) { if (rc) {
ip->i_nlink = 0; ip->i_nlink = 0;
iput(ip); iput(ip);
} } else
d_instantiate(dentry, ip);
out2: out2:
free_UCSname(&dname); free_UCSname(&dname);
...@@ -1368,7 +1370,6 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry, ...@@ -1368,7 +1370,6 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
insert_inode_hash(ip); insert_inode_hash(ip);
mark_inode_dirty(ip); mark_inode_dirty(ip);
d_instantiate(dentry, ip);
dir->i_ctime = dir->i_mtime = CURRENT_TIME; dir->i_ctime = dir->i_mtime = CURRENT_TIME;
...@@ -1385,7 +1386,8 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry, ...@@ -1385,7 +1386,8 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
if (rc) { if (rc) {
ip->i_nlink = 0; ip->i_nlink = 0;
iput(ip); iput(ip);
} } else
d_instantiate(dentry, ip);
out1: out1:
free_UCSname(&dname); free_UCSname(&dname);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment