Skip to contentSkip to conversation

GFS2: Pre-pull patch posting (fixes)

PATCH New Steven Whitehouse 1 participant 3 messages Nov 22, 2013 GFS2 file system

lore
Share & tools
lore
#1 lore raw

PATCH 1/2 GFS2: fix potential NULL pointer dereference

From: Michal Nazarewicz <[email protected]>

Commit [e66cf1610: GFS2: Use lockref for glocks] replaced call:

    atomic_read(&gi->gl->gl_ref) == 0
with:
    __lockref_is_dead(&gl->gl_lockref)

therefore changing how gl is accessed, from gi->gl to plan gl. However, gl can be a NULL pointer, and so gi->gl needs to be used instead (which is guaranteed not to be NULL because fo the while loop checking that condition).

fs/gfs2/glock.c +2 -1
index e66a800..c8420f7 100644
@@ -1899,7 +1899,8 @@ static int gfs2_glock_iter_next(struct gfs2_glock_iter *gi)
 			gi->nhash = 0;
 		}
 	/* Skip entries for other sb and dead entries */
-	} while (gi->sdp != gi->gl->gl_sbd || __lockref_is_dead(&gl->gl_lockref));
+	} while (gi->sdp != gi->gl->gl_sbd ||
+		 __lockref_is_dead(&gi->gl->gl_lockref));
 
 	return 0;
 }
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/2 GFS2: Fix ref count bug relating to atomic_open

In reply to Steven Whitehouse

In the case that atomic_open calls finish_no_open() with the dentry that was supplied to gfs2_atomic_open() an extra reference count is required. This patch fixes that issue preventing a bug trap triggering at umount time.

fs/gfs2/inode.c +4 -1
index 1615df1..7119504 100644
@@ -1171,8 +1171,11 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry,
 	if (d != NULL)
 		dentry = d;
 	if (dentry->d_inode) {
-		if (!(*opened & FILE_OPENED))
+		if (!(*opened & FILE_OPENED)) {
+			if (d == NULL)
+				dget(dentry);
 			return finish_no_open(file, dentry);
+		}
 		dput(d);
 		return 0;
 	}
Signature · 1 line
1.8.3.1