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

Merge "Fix APF programs to not generate a failing compare of size 0" into nyc-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2016-03-23 01:17:56 +00:00
committed by Android (Google) Code Review
parent 8ed1e55ea9 7c34b15f74
commit 81a00e725d
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/connectivity/ApfFilter.java
View File

@@ -411,11 +411,17 @@ public class ApfFilter {
for (int i = 0; i < mNonLifetimes.size(); i++) {
// Generate code to match the packet bytes
Pair<Integer, Integer> nonLifetime = mNonLifetimes.get(i);
gen.addLoadImmediate(Register.R0, nonLifetime.first);
gen.addJumpIfBytesNotEqual(Register.R0,
Arrays.copyOfRange(mPacket.array(), nonLifetime.first,
nonLifetime.first + nonLifetime.second),
nextFilterLabel);
// Don't generate JNEBS instruction for 0 bytes as it always fails the
// ASSERT_FORWARD_IN_PROGRAM(pc + cmp_imm - 1) check where cmp_imm is
// the number of bytes to compare. nonLifetime is zero between the
// valid and preferred lifetimes in the prefix option.
if (nonLifetime.second != 0) {
gen.addLoadImmediate(Register.R0, nonLifetime.first);
gen.addJumpIfBytesNotEqual(Register.R0,
Arrays.copyOfRange(mPacket.array(), nonLifetime.first,
nonLifetime.first + nonLifetime.second),
nextFilterLabel);
}
// Generate code to test the lifetimes haven't gone down too far
if ((i + 1) < mNonLifetimes.size()) {
Pair<Integer, Integer> nextNonLifetime = mNonLifetimes.get(i + 1);