Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 669a1535 authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

Fix vulnerability in LockSettings service am: 2d71384a am: 485fbda0 am:... 

Fix vulnerability in LockSettings service am: 2d71384a am: 485fbda0 am: 229de708 am: cb83f618
am: e3457fc1

Change-Id: I1bc40c141498e62cad36acc9568177cb88debc11
parents 4fa4b298 e3457fc1

services/core/java/com/android/server/LockSettingsService.java

+6 −0
Original line number Diff line number Diff line
@@ -1222,6 +1222,9 @@ public class LockSettingsService extends ILockSettings.Stub { 
            long challenge, int userId, ICheckCredentialProgressCallback progressCallback)

            throws RemoteException {

       checkPasswordReadPermission(userId);

       if (TextUtils.isEmpty(pattern)) {

           throw new IllegalArgumentException("Pattern can't be null or empty");

       }

       CredentialHash storedHash = mStorage.readPatternHash(userId);

       return doVerifyPattern(pattern, storedHash, hasChallenge, challenge, userId,

               progressCallback);
@@ -1323,6 +1326,9 @@ public class LockSettingsService extends ILockSettings.Stub { 
            long challenge, int userId, ICheckCredentialProgressCallback progressCallback)

            throws RemoteException {

       checkPasswordReadPermission(userId);

       if (TextUtils.isEmpty(password)) {

           throw new IllegalArgumentException("Password can't be null or empty");

       }

       CredentialHash storedHash = mStorage.readPasswordHash(userId);

       return doVerifyPassword(password, storedHash, hasChallenge, challenge, userId,

               progressCallback);