ANDROID: sdcardfs: Don't bother deleting freelist
authorDaniel Rosenberg <drosen@google.com>
Wed, 22 Feb 2017 22:41:58 +0000 (14:41 -0800)
committerDaniel Rosenberg <drosen@google.com>
Tue, 30 Jan 2018 03:40:04 +0000 (19:40 -0800)
There is no point deleting entries from dlist, as
that is a temporary list on the stack from which
contains only entries that are being deleted.

Not all code paths set up dlist, so those that
don't were performing invalid accesses in
hash_del_rcu. As an additional means to prevent
any other issue, we null out the list entries when
we allocate from the cache.

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 35666680
Change-Id: Ibb1e28c08c3a600c29418d39ba1c0f3db3bf31e5

fs/sdcardfs/packagelist.c

index 537ff523c32a6f34f67f62b11c9127f9ff52b12e..5f81284a4f44ee450f7556d004ba470d703d1c17 100644 (file)
@@ -181,6 +181,8 @@ static struct hashtable_entry *alloc_hashtable_entry(const struct qstr *key,
                        GFP_KERNEL);
        if (!ret)
                return NULL;
+       INIT_HLIST_NODE(&ret->dlist);
+       INIT_HLIST_NODE(&ret->hlist);
 
        if (!qstr_copy(key, &ret->key)) {
                kmem_cache_free(hashtable_entry_cachep, ret);
@@ -329,7 +331,6 @@ static int insert_userid_exclude_entry(const struct qstr *key, userid_t value)
 static void free_hashtable_entry(struct hashtable_entry *entry)
 {
        kfree(entry->key.name);
-       hash_del_rcu(&entry->dlist);
        kmem_cache_free(hashtable_entry_cachep, entry);
 }