1 files changed, 4 insertions, 1 deletions

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 81968a065b4c..3956f5149e25 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2468,6 +2468,9 @@ mark_held_locks(struct task_struct *curr, enum mark_type mark)
 
                 BUG_ON(usage_bit >= LOCK_USAGE_STATES);
 
+                if (hlock_class(hlock)->key == &__lockdep_no_validate__)
+                        continue;
+
                 if (!mark_lock(curr, hlock, usage_bit))
                         return 0;
         }
@@ -3436,7 +3439,7 @@ int lock_is_held(struct lockdep_map *lock)
         int ret = 0;
 
         if (unlikely(current->lockdep_recursion))
-                return ret;
+                return 1; /* avoid false negative lockdep_assert_held() */
 
         raw_local_irq_save(flags);
         check_flags(flags);