From 80248d44b559442752510af2543c484bd42c961e Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 31 Oct 2012 12:41:14 -0700 Subject: SerialManager: Only allow opening files that are whitelisted serial port devices Bug: 7367956 Change-Id: I82fd8d2694dda89332497d9eded5445a0262e12b Signed-off-by: Mike Lockwood --- services/java/com/android/server/SerialService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/SerialService.java b/services/java/com/android/server/SerialService.java index 5d2b2a0d3304..1abe4588261a 100644 --- a/services/java/com/android/server/SerialService.java +++ b/services/java/com/android/server/SerialService.java @@ -51,7 +51,12 @@ public class SerialService extends ISerialManager.Stub { public ParcelFileDescriptor openSerialPort(String path) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SERIAL_PORT, null); - return native_open(path); + for (int i = 0; i < mSerialPorts.length; i++) { + if (mSerialPorts[i].equals(path)) { + return native_open(path); + } + } + throw new IllegalArgumentException("Invalid serial port " + path); } private native ParcelFileDescriptor native_open(String path); -- cgit v1.2.3-59-g8ed1b