From 2a2ee0af443dbd8d924c26706445f1660d423ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Tue, 29 Jul 2025 14:22:22 -0700
Subject: [PATCH] Tweak: Throw exception for oversized BpfMap keys/values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Throw an IllegalArgumentException if the key or value sizes exceed the
limits supported by the BpfMap implementation. This prevents potential
file descriptor cache collisions and makes errors explicit.

Test: TreeHugger
Flag: EXEMPT mainline/noop
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3b2b533e4217ee2ab8bfcd71e93b02ffcf9feba9
---
 staticlibs/device/com/android/net/module/util/BpfMap.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/staticlibs/device/com/android/net/module/util/BpfMap.java b/staticlibs/device/com/android/net/module/util/BpfMap.java
index 0fbc25de7b..7dbe2c494c 100644
--- a/staticlibs/device/com/android/net/module/util/BpfMap.java
+++ b/staticlibs/device/com/android/net/module/util/BpfMap.java
@@ -84,8 +84,12 @@ public class BpfMap<K extends Struct, V extends Struct> implements IBpfMap<K, V>
             throws ErrnoException, NullPointerException {
         // Supports up to 1023 byte key and 65535 byte values
         // Creating a BpfMap with larger keys/values seems like a bad idea any way...
-        keySize &= 1023; // 10-bits
-        valueSize &= 65535; // 16-bits
+        if (keySize > 1023) {
+            throw new IllegalArgumentException("Key size " + keySize + " exceeds 1023");
+        }
+        if (valueSize > 65535) {
+            throw new IllegalArgumentException("Value size " + valueSize + " exceeds 65535");
+        }
         var key = Pair.create(path, (mode << 26) ^ (keySize << 16) ^ valueSize);
         // unlocked fetch is safe: map is concurrent read capable, and only inserted into
         ParcelFileDescriptor fd = sFdCache.get(key);