kern: fix KHandleTable null deref in ipc

2020-12-02 04:05:16 -08:00
parent eccadf2958
commit 94d818db90
1 changed files with 4 additions and 2 deletions
--- a/libraries/libmesosphere/include/mesosphere/kern_k_handle_table.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_handle_table.hpp
@@ -166,8 +166,10 @@ namespace ams::kern {
                KScopedSpinLock lk(this->lock);

                KAutoObject *obj = this->GetObjectImpl(handle);
-                if (obj->DynamicCast<KInterruptEvent *>() != nullptr) {
-                    return nullptr;
+                if (AMS_LIKELY(obj != nullptr)) {
+                    if (AMS_UNLIKELY(obj->DynamicCast<KInterruptEvent *>() != nullptr)) {
+                        return nullptr;
+                    }
                }

                return obj;