Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into udc-dev

Browse Source
This commit is contained in:
Austin Borger
2023-02-24 01:17:40 +00:00
committed by Android (Google) Code Review
parent 79ecdf41ce 922e52bc3d
commit 1a03b253e6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/AttributionSource.java
View File

@@ -155,6 +155,11 @@ public final class AttributionSource implements Parcelable {
AttributionSource(@NonNull Parcel in) { AttributionSource(@NonNull Parcel in) {
this(AttributionSourceState.CREATOR.createFromParcel(in)); this(AttributionSourceState.CREATOR.createFromParcel(in));
if (!Binder.isDirectlyHandlingTransaction()) {
throw new SecurityException("AttributionSource should be unparceled during a binder "
+ "transaction for proper verification.");
}
// Since we just unpacked this object as part of it transiting a Binder // Since we just unpacked this object as part of it transiting a Binder
// call, this is the perfect time to enforce that its UID and PID can be trusted // call, this is the perfect time to enforce that its UID and PID can be trusted
enforceCallingUidAndPid(); enforceCallingUidAndPid();