Merge pull request #682 from assafcarlsbad/signal_event_on_install_protocol

Signal event upon InstallProtocolInterface.

Author: xwings

qiling/os/uefi/bs.py

@@ -132,14 +132,7 @@ def hook_SignalEvent(ql, address, params):
 	event_id = params["Event"]
 
 	if event_id in ql.loader.events:
-		event = ql.loader.events[event_id]
-
-		if not event["Set"]:
-			event["Set"] = True
-			notify_func = event["NotifyFunction"]
-			notify_context = event["NotifyContext"]
-			ql.loader.notify_list.append((event_id, notify_func, notify_context))
-
+		signal_event(ql, event_id)
 		return EFI_SUCCESS
 	else:
 		return EFI_INVALID_PARAMETER

qiling/os/uefi/protocols/common.py

@@ -4,7 +4,7 @@
 #
 
 from qiling.os.uefi.const import EFI_SUCCESS, EFI_NOT_FOUND, EFI_UNSUPPORTED, EFI_BUFFER_TOO_SMALL, EFI_INVALID_PARAMETER
-from qiling.os.uefi.utils import read_int64, write_int64, check_and_notify_protocols
+from qiling.os.uefi.utils import read_int64, write_int64, check_and_notify_protocols, signal_event
 from qiling.os.uefi.UefiSpec import EFI_LOCATE_SEARCH_TYPE
 
 # TODO: get rid of this
@@ -37,6 +37,12 @@ def InstallProtocolInterface(context, params):
 
 	dic[params["Protocol"]] = params["Interface"]
 	context.protocols[handle] = dic
+
+	for (event_id, event_dic) in context.ql.loader.events.items():
+		if event_dic['Guid'] == params['Protocol']:
+			# The event was previously registered by 'RegisterProtocolNotify'.
+			signal_event(context.ql, event_id)	
+
 	check_and_notify_protocols(context.ql)
 	write_int64(context.ql, params["Handle"], handle)
 

qiling/os/uefi/utils.py

@@ -12,6 +12,15 @@
 from qiling.os.uefi.UefiSpec import EFI_CONFIGURATION_TABLE, EFI_SYSTEM_TABLE
 from qiling.os.uefi.UefiBaseType import EFI_GUID
 
+def signal_event(ql, event_id: int) -> None:
+	event = ql.loader.events[event_id]
+
+	if not event["Set"]:
+		event["Set"] = True
+		notify_func = event["NotifyFunction"]
+		notify_context = event["NotifyContext"]
+		ql.loader.notify_list.append((event_id, notify_func, notify_context))
+
 def check_and_notify_protocols(ql) -> bool:
 	if ql.loader.notify_list:
 		event_id, notify_func, notify_context = ql.loader.notify_list.pop(0)