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

Merge "BootReceiver: cap the number of sent kernel memory corruptions" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-09 22:37:06 +00:00
committed by Android (Google) Code Review
parent c8faccf35a 60dbeef46d
commit 46c0a4b925
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/BootReceiver.java
View File

@@ -128,6 +128,9 @@ public class BootReceiver extends BroadcastReceiver {
// Location of ftrace pipe for notifications from kernel memory tools like KFENCE and KASAN. // Location of ftrace pipe for notifications from kernel memory tools like KFENCE and KASAN.
private static final String ERROR_REPORT_TRACE_PIPE = private static final String ERROR_REPORT_TRACE_PIPE =
"/sys/kernel/tracing/instances/bootreceiver/trace_pipe"; "/sys/kernel/tracing/instances/bootreceiver/trace_pipe";
// Stop after sending this many reports. See http://b/182159975.
private static final int MAX_ERROR_REPORTS = 8;
private static int sSentReports = 0;
// Avoid reporing the same bug from processDmesg() twice. // Avoid reporing the same bug from processDmesg() twice.
private static String sLastReportedBug = null; private static String sLastReportedBug = null;
@@ -301,7 +304,7 @@ public class BootReceiver extends BroadcastReceiver {
* - repeat the above steps till the last report is found. * - repeat the above steps till the last report is found.
*/ */
private void processDmesg(Context ctx) throws IOException { private void processDmesg(Context ctx) throws IOException {
if (sSentReports == MAX_ERROR_REPORTS) return;
/* /*
* Only SYSTEM_KASAN_ERROR_REPORT and SYSTEM_KFENCE_ERROR_REPORT are supported at the * Only SYSTEM_KASAN_ERROR_REPORT and SYSTEM_KFENCE_ERROR_REPORT are supported at the
* moment. * moment.
@@ -352,7 +355,7 @@ public class BootReceiver extends BroadcastReceiver {
} }
// Avoid sending the same bug report twice. // Avoid sending the same bug report twice.
if (bugTitle == sLastReportedBug) return; if (bugTitle.equals(sLastReportedBug)) return;
final String reportTag = "SYSTEM_" + tool + "_ERROR_REPORT"; final String reportTag = "SYSTEM_" + tool + "_ERROR_REPORT";
final DropBoxManager db = ctx.getSystemService(DropBoxManager.class); final DropBoxManager db = ctx.getSystemService(DropBoxManager.class);
@@ -361,6 +364,7 @@ public class BootReceiver extends BroadcastReceiver {
addTextToDropBox(db, reportTag, reportText, "/dev/kmsg", LOG_SIZE); addTextToDropBox(db, reportTag, reportText, "/dev/kmsg", LOG_SIZE);
sLastReportedBug = bugTitle; sLastReportedBug = bugTitle;
sSentReports++;
} }
private void removeOldUpdatePackages(Context context) { private void removeOldUpdatePackages(Context context) {