Merge "Expose binder security context to rust binder services" (4f77028e) · Commits · e / os / android_frameworks_native-old

libs/binder/ndk/ibinder.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#include <android/binder_context.h>
		#include <android/binder_ibinder.h>
		#include <android/binder_ibinder_platform.h>
		#include "ibinder_internal.h"

libs/binder/ndk/include_platform/android/binder_context.h

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.
		*/

		#pragma once

		#include <android/binder_ibinder.h>

		__BEGIN_DECLS

		/**
		* Makes calls to AIBinder_getCallingSid work if the kernel supports it. This
		* must be called on a local binder server before it is sent out to any othe
		* process. If this is a remote binder, it will abort. If the kernel doesn't
		* support this feature, you'll always get null from AIBinder_getCallingSid.
		*
		* \param binder local server binder to request security contexts on
		*/
		__attribute__((weak)) void AIBinder_setRequestingSid(AIBinder* binder, bool requestingSid)
		__INTRODUCED_IN(31);

		/**
		* Returns the selinux context of the callee.
		*
		* In order for this to work, the following conditions must be met:
		* - The kernel must be new enough to support this feature.
		* - The server must have called AIBinder_setRequestingSid.
		* - The callee must be a remote process.
		*
		* \return security context or null if unavailable. The lifetime of this context
		* is the lifetime of the transaction.
		*/
		__attribute__((weak, warn_unused_result)) const char* AIBinder_getCallingSid() __INTRODUCED_IN(31);

		__END_DECLS

libs/binder/ndk/include_platform/android/binder_ibinder_platform.h

+5 −32

Original line number	Diff line number	Diff line
		@@ -16,41 +16,14 @@

		#pragma once

		#include <android/binder_ibinder.h>
		// binder_context.h used to be part of this header and is included for backwards
		// compatibility.
		#include <android/binder_context.h>

		#if !defined(__ANDROID_APEX__) && !defined(__ANDROID_VNDK__)
		#include <binder/IBinder.h>
		#endif

		__BEGIN_DECLS

		/**
		* Makes calls to AIBinder_getCallingSid work if the kernel supports it. This
		* must be called on a local binder server before it is sent out to any othe
		* process. If this is a remote binder, it will abort. If the kernel doesn't
		* support this feature, you'll always get null from AIBinder_getCallingSid.
		*
		* \param binder local server binder to request security contexts on
		*/
		__attribute__((weak)) void AIBinder_setRequestingSid(AIBinder* binder, bool requestingSid)
		__INTRODUCED_IN(31);

		/**
		* Returns the selinux context of the callee.
		*
		* In order for this to work, the following conditions must be met:
		* - The kernel must be new enough to support this feature.
		* - The server must have called AIBinder_setRequestingSid.
		* - The callee must be a remote process.
		*
		* \return security context or null if unavailable. The lifetime of this context
		* is the lifetime of the transaction.
		*/
		__attribute__((weak, warn_unused_result)) const char* AIBinder_getCallingSid() __INTRODUCED_IN(31);

		__END_DECLS

		#if !defined(__ANDROID_APEX__) && !defined(__ANDROID_VNDK__)
		#include <android/binder_ibinder.h>
		#include <binder/IBinder.h>

		/**
		* Get libbinder version of binder from AIBinder.

libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#include <aidl/BnBinderNdkUnitTest.h>
		#include <aidl/BnEmpty.h>
		#include <android-base/logging.h>
		#include <android/binder_context.h>
		#include <android/binder_ibinder_jni.h>
		#include <android/binder_ibinder_platform.h>
		#include <android/binder_manager.h>

libs/binder/rust/src/binder.rs

+3 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,9 @@ pub trait IBinder {
		/// Send a ping transaction to this object
		fn ping_binder(&mut self) -> Result<()>;

		/// Indicate that the service intends to receive caller security contexts.
		fn set_requesting_sid(&mut self, enable: bool);

		/// Dump this object to the given file handle
		fn dump<F: AsRawFd>(&mut self, fp: &F, args: &[&str]) -> Result<()>;