Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36bd9844 authored by JP Abgrall's avatar JP Abgrall
Browse files

core/java NetworkManagement: Don't untag sockets willy-nilly 

Tagging is conditional on having some useful info to tag.
But untagging had not such restriction leading to unnecessary kernel
calls that just fail with EINVAL.

b/5165619

Change-Id: Idd4b1dc45db04429f85e3ba37656640a8d33046a
parent bb04b678

core/java/com/android/server/NetworkManagementSocketTagger.java

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ public final class NetworkManagementSocketTagger extends SocketTagger { 


    private void unTagSocketFd(FileDescriptor fd) throws IOException {

        int fdNum = fd.getInt$();

        if (fdNum == -1) return;

        final SocketTags options = threadSocketTags.get();

        if (fdNum == -1 || (options.statsTag == -1 && options.statsUid == -1)) return;

        String cmd = "u " + fdNum;

        internalModuleCtrl(cmd);

    }