]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
GFS2: Protect freeing directory hash table with i_lock spin_lock
authorBob Peterson <rpeterso@redhat.com>
Thu, 29 Oct 2015 15:03:41 +0000 (10:03 -0500)
committerBob Peterson <rpeterso@redhat.com>
Wed, 4 Nov 2015 18:05:42 +0000 (12:05 -0600)
This patch changes function gfs2_dir_hash_inval so it uses the
i_lock spin_lock to protect the in-core hash table, i_hash_cache.
This will prevent double-frees due to a race between gfs2_evict_inode
and inode invalidation.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
fs/gfs2/dir.c

index 487527b42d94a381d329d8be5ae4459cafabe15b..ad8a5b757cc74451eae9abf6023d3e94065ac1ab 100644 (file)
@@ -388,8 +388,13 @@ static __be64 *gfs2_dir_get_hash_table(struct gfs2_inode *ip)
  */
 void gfs2_dir_hash_inval(struct gfs2_inode *ip)
 {
-       __be64 *hc = ip->i_hash_cache;
+       __be64 *hc;
+
+       spin_lock(&ip->i_inode.i_lock);
+       hc = ip->i_hash_cache;
        ip->i_hash_cache = NULL;
+       spin_unlock(&ip->i_inode.i_lock);
+
        kvfree(hc);
 }