github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 15:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: Restore a line removed accidentally during a revert

Browse Source 
When reverting commit 9ad8ff902e in
android-mainline (commit 31c9ccb138),
a call to __mutex_remove_waiter() was accidentally removed. That results
in a mutex waiter being left in the wait_list of the mutex in the error
handling path of __mutex_lock_common(). The issue was reproduced by
running controllers.memcg ltp tests and results in a kernel crash that
looks like this:

[  306.207016] list_del corruption. next->prev should be ffffa5f983a479d0, but was ffffa5f983a6f9e8
[  306.207271] ------------[ cut here ]------------
[  306.207328] kernel BUG at lib/list_debug.c:56!

Fix this by restoring the removed line.

Fixes: 31c9ccb138 ("Revert "ANDROID: vendor_hooks: add waiting information for blocked tasks"")
Bug: 199506772
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I49ac82b20405fda0ea7d10fae68402279ad751fa
This commit is contained in:
Suren Baghdasaryan 2021-10-08 12:13:42 -07:00 committed by Steve Muckle
parent 8d3bbb3575
commit e5e5f587d9
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/locking/mutex.c
View File

@ -713,6 +713,7 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas
err:
__set_current_state(TASK_RUNNING);
__mutex_remove_waiter(lock, &waiter);
err_early_kill:
raw_spin_unlock(&lock->wait_lock);
debug_mutex_free_waiter(&waiter);