Add null check to prevent security exploit

Bug: 34230372
Test: compile, run ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Id6951be18a17447c199ff54a86d66f322b091867

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
index 9cf2cc944..24f1abccb 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
@@ -61,6 +61,7 @@ import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Messenger;
 import android.os.RemoteException;
 import android.os.WorkSource;
 import android.os.test.TestLooper;
@@ -2272,4 +2273,22 @@ public class WifiScanningServiceTest {
         verifySingleScanCompletedReceived(order, handler, requestId);
         verifyNoMoreInteractions(handler);
     }
+
+    /**
+     * Verifies that null msg.replyTo is handled properly
+     */
+    @Test
+    public void nullReplyToInMsgIsHandled() throws RemoteException {
+        startServiceAndLoadDriver();
+        mWifiScanningServiceImpl.setWifiHandlerLogForTest(mLog);
+        final Message message = Message.obtain();
+        message.what = AsyncChannel.CMD_CHANNEL_FULL_CONNECTION;
+        message.replyTo = null;
+
+        //  can't use BidirectionalAsyncChannel to send message because that
+        //  will override message.replyTo to non-null
+        Messenger messenger = mWifiScanningServiceImpl.getMessenger();
+        messenger.send(message);
+        verify(mFrameworkFacade, never()).makeWifiAsyncChannel(anyString());
+    }
 }