Merge changes from topic "qtaguidReplace" am: 6707ef139d am: 45eca0a011 (95bc78a4) · Commits · e / os / android_system_core

libcutils/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ cc_library {
		"klog.cpp",
		"partition_utils.c",
		"properties.cpp",
		"qtaguid.c",
		"qtaguid.cpp",
		"trace-dev.c",
		"uevent.cpp",
		],

libcutils/include/cutils/qtaguid.h

+4 −8

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 The Android Open Source Project
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -17,18 +17,14 @@
		#ifndef __CUTILS_QTAGUID_H
		#define __CUTILS_QTAGUID_H

		#include <stdint.h>
		#include <sys/types.h>
		#include <unistd.h>

		#ifdef __cplusplus
		extern "C" {
		#endif

		/*
		* Set tags (and owning UIDs) for network sockets. The socket must be untagged
		* by calling qtaguid_untagSocket() before closing it, otherwise the qtaguid
		* module will keep a reference to it even after close.
		* Set tags (and owning UIDs) for network sockets.
		*/
		extern int qtaguid_tagSocket(int sockfd, int tag, uid_t uid);

		@@ -46,8 +42,8 @@ extern int qtaguid_setCounterSet(int counterSetNum, uid_t uid);

		/*
		* Delete all tag info that relates to the given tag an uid.
		* If the tag is 0, then ALL info about the uid is freeded.
		* The delete data also affects active tagged socketd, which are
		* If the tag is 0, then ALL info about the uid is freed.
		* The delete data also affects active tagged sockets, which are
		* then untagged.
		* The calling process can only operate on its own tags.
		* Unless it is part of the happy AID_NET_BW_ACCT group.

libcutils/qtaguid.cpp

0 → 100644

+125 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		// #define LOG_NDEBUG 0

		#define LOG_TAG "qtaguid"

		#include <dlfcn.h>
		#include <errno.h>
		#include <fcntl.h>
		#include <inttypes.h>
		#include <stdio.h>
		#include <string.h>
		#include <unistd.h>

		#include <cutils/qtaguid.h>
		#include <log/log.h>

		class netdHandler {
		public:
		int (*netdTagSocket)(int, uint32_t, uid_t);
		int (*netdUntagSocket)(int);
		int (*netdSetCounterSet)(uint32_t, uid_t);
		int (*netdDeleteTagData)(uint32_t, uid_t);
		};

		int dummyTagSocket(int, uint32_t, uid_t) {
		return -EREMOTEIO;
		}

		int dummyUntagSocket(int) {
		return -EREMOTEIO;
		}

		int dummySetCounterSet(uint32_t, uid_t) {
		return -EREMOTEIO;
		}

		int dummyDeleteTagData(uint32_t, uid_t) {
		return -EREMOTEIO;
		}

		netdHandler initHandler(void) {
		netdHandler handler = {dummyTagSocket, dummyUntagSocket, dummySetCounterSet, dummyDeleteTagData};

		void* netdClientHandle = dlopen("libnetd_client.so", RTLD_NOW);
		if (!netdClientHandle) {
		ALOGE("Failed to open libnetd_client.so: %s", dlerror());
		return handler;
		}

		handler.netdTagSocket = (int (*)(int, uint32_t, uid_t))dlsym(netdClientHandle, "tagSocket");
		if (!handler.netdTagSocket) {
		ALOGE("load netdTagSocket handler failed: %s", dlerror());
		}

		handler.netdUntagSocket = (int (*)(int))dlsym(netdClientHandle, "untagSocket");
		if (!handler.netdUntagSocket) {
		ALOGE("load netdUntagSocket handler failed: %s", dlerror());
		}

		handler.netdSetCounterSet = (int (*)(uint32_t, uid_t))dlsym(netdClientHandle, "setCounterSet");
		if (!handler.netdSetCounterSet) {
		ALOGE("load netdSetCounterSet handler failed: %s", dlerror());
		}

		handler.netdDeleteTagData = (int (*)(uint32_t, uid_t))dlsym(netdClientHandle, "deleteTagData");
		if (!handler.netdDeleteTagData) {
		ALOGE("load netdDeleteTagData handler failed: %s", dlerror());
		}
		return handler;
		}

		// The language guarantees that this object will be initialized in a thread-safe way.
		static netdHandler& getHandler() {
		static netdHandler instance = initHandler();
		return instance;
		}

		int qtaguid_tagSocket(int sockfd, int tag, uid_t uid) {
		// Check the socket fd passed to us is still valid before we load the netd
		// client. Pass a already closed socket fd to netd client may let netd open
		// the unix socket with the same fd number and pass it to server for
		// tagging.
		// TODO: move the check into netdTagSocket.
		int res = fcntl(sockfd, F_GETFD);
		if (res < 0) return res;

		ALOGV("Tagging socket %d with tag %u for uid %d", sockfd, tag, uid);
		return getHandler().netdTagSocket(sockfd, tag, uid);
		}

		int qtaguid_untagSocket(int sockfd) {
		// Similiar to tag socket. We need a check before untag to make sure untag a closed socket fail
		// as expected.
		// TODO: move the check into netdTagSocket.
		int res = fcntl(sockfd, F_GETFD);
		if (res < 0) return res;

		ALOGV("Untagging socket %d", sockfd);
		return getHandler().netdUntagSocket(sockfd);
		}

		int qtaguid_setCounterSet(int counterSetNum, uid_t uid) {
		ALOGV("Setting counters to set %d for uid %d", counterSetNum, uid);
		return getHandler().netdSetCounterSet(counterSetNum, uid);
		}

		int qtaguid_deleteTagData(int tag, uid_t uid) {
		ALOGV("Deleting tag data with tag %u for uid %d", tag, uid);
		return getHandler().netdDeleteTagData(tag, uid);
		}

libqtaguid/Android.bp

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2017 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.
		//

		cc_library_headers {
		name: "libqtaguid_headers",
		vendor_available: false,
		host_supported: false,
		export_include_dirs: ["include"],
		target: {
		linux_bionic: {
		enabled: true,
		},
		},
		}

		cc_library {
		name: "libqtaguid",
		vendor_available: false,
		host_supported: false,
		target: {
		android: {
		srcs: [
		"qtaguid.c",
		],
		sanitize: {
		misc_undefined: ["integer"],
		},
		},
		},

		shared_libs: ["liblog"],
		header_libs: [
		"libqtaguid_headers",
		],
		export_header_lib_headers: ["libqtaguid_headers"],
		local_include_dirs: ["include"],

		cflags: [
		"-Werror",
		"-Wall",
		"-Wextra",
		],
		}

libqtaguid/include/qtaguid/qtaguid.h

0 → 100644

+62 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef __LEGACY_QTAGUID_H
		#define __LEGACY_QTAGUID_H

		#include <stdint.h>
		#include <sys/types.h>
		#include <unistd.h>

		#ifdef __cplusplus
		extern "C" {
		#endif

		/*
		* Set tags (and owning UIDs) for network sockets. The socket must be untagged
		* by calling qtaguid_untagSocket() before closing it, otherwise the qtaguid
		* module will keep a reference to it even after close.
		*/
		extern int legacy_tagSocket(int sockfd, int tag, uid_t uid);

		/*
		* Untag a network socket before closing.
		*/
		extern int legacy_untagSocket(int sockfd);

		/*
		* For the given uid, switch counter sets.
		* The kernel only keeps a limited number of sets.
		* 2 for now.
		*/
		extern int legacy_setCounterSet(int counterSetNum, uid_t uid);

		/*
		* Delete all tag info that relates to the given tag an uid.
		* If the tag is 0, then ALL info about the uid is freeded.
		* The delete data also affects active tagged socketd, which are
		* then untagged.
		* The calling process can only operate on its own tags.
		* Unless it is part of the happy AID_NET_BW_ACCT group.
		* In which case it can clobber everything.
		*/
		extern int legacy_deleteTagData(int tag, uid_t uid);

		#ifdef __cplusplus
		}
		#endif

		#endif /* __LEGACY_QTAGUID_H */