Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'gfs2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull GFS2 fixes from Steven Whitehouse:
"A couple of small, but important bug fixes for GFS2. The first one
fixes a possible NULL pointer dereference, and the second one resolves
a reference counting issue in one of the lesser used paths through
atomic_open"
* tag 'gfs2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
GFS2: Fix ref count bug relating to atomic_open
GFS2: fix potential NULL pointer dereference
+6
-2
+2
-1
fs/gfs2/glock.c
+2
-1
fs/gfs2/glock.c
···
1899
1899
gi->nhash = 0;
1900
1900
}
1901
1901
/* Skip entries for other sb and dead entries */
1902
-
} while (gi->sdp != gi->gl->gl_sbd || __lockref_is_dead(&gl->gl_lockref));
1902
+
} while (gi->sdp != gi->gl->gl_sbd ||
1903
+
__lockref_is_dead(&gi->gl->gl_lockref));
1903
1904
1904
1905
return 0;
1905
1906
}
+4
-1
fs/gfs2/inode.c
+4
-1
fs/gfs2/inode.c
···
1171
1171
if (d != NULL)
1172
1172
dentry = d;
1173
1173
if (dentry->d_inode) {
1174
-
if (!(*opened & FILE_OPENED))
1174
+
if (!(*opened & FILE_OPENED)) {
1175
+
if (d == NULL)
1176
+
dget(dentry);
1175
1177
return finish_no_open(file, dentry);
1178
+
}
1176
1179
dput(d);
1177
1180
return 0;
1178
1181
}