validate applet handler pointers (#270)

transparency-dev · Aug 16, 2024 · 5fd3b4a · 5fd3b4a
1 parent 4aaa133
commit 5fd3b4a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/trusted_os/rpc.go b/trusted_os/rpc.go
@@ -87,9 +87,13 @@ func (r *RPC) Address(mac net.HardwareAddr, _ *bool) error {
 	return nil
 }
 
+func isAppletMemory(addr uint32) bool {
+	return addr >= appletStart && addr < appletStart + appletSize
+}
+
 // Register registers the Trusted Applet event handler.
 func (r *RPC) Register(handler rpc.Handler, _ *bool) error {
-	if handler.G == 0 || handler.P == 0 {
+	if !isAppletMemory(handler.G) || !isAppletMemory(handler.P) {
 		return errors.New("invalid argument")
 	}