Skip to content

security: add FLAG_IMMUTABLE to PendingIntents #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sec0xEd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

security: add FLAG_IMMUTABLE to PendingIntents #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/com/android/messaging/datamodel/action/ActionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,11 @@ public static PendingIntent makeStartActionPendingIntent(final Context context,
if (launchesAnActivity) {
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
}
// Use FLAG_IMMUTABLE since this PendingIntent doesn't require modification.
// This prevents potential PendingIntent hijacking attacks.
// Reference: https://developer.android.com/reference/android/app/PendingIntent#FLAG_IMMUTABLE
return PendingIntent.getBroadcast(context, requestCode, intent,
PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}

/**
Expand Down
4 changes: 3 additions & 1 deletion src/com/android/messaging/ui/UIIntentsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,8 +483,10 @@ public PendingIntent getPendingIntentForLowStorageNotifications(final Context co
taskStackBuilder.addNextIntentWithParentStack(
getSmsStorageLowWarningActivityIntent(context));

// Use FLAG_IMMUTABLE since this PendingIntent launches a fixed activity
// and doesn't require modification by external apps.
return taskStackBuilder.getPendingIntent(
0, PendingIntent.FLAG_UPDATE_CURRENT);
0, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}

@Override
Expand Down