Merge "FROMLIST: ANDROID: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl." (cab2a311) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/android/binder.c

+55 −0

Original line number	Diff line number	Diff line
		@@ -4715,6 +4715,42 @@ static int binder_ioctl_set_ctx_mgr(struct file *filp)
		return ret;
		}

		static int binder_ioctl_get_node_info_for_ref(struct binder_proc *proc,
		struct binder_node_info_for_ref *info)
		{
		struct binder_node *node;
		struct binder_context *context = proc->context;
		__u32 handle = info->handle;

		if (info->strong_count \|\| info->weak_count \|\| info->reserved1 \|\|
		info->reserved2 \|\| info->reserved3) {
		binder_user_error("%d BINDER_GET_NODE_INFO_FOR_REF: only handle may be non-zero.",
		proc->pid);
		return -EINVAL;
		}

		/* This ioctl may only be used by the context manager */
		mutex_lock(&context->context_mgr_node_lock);
		if (!context->binder_context_mgr_node \|\|
		context->binder_context_mgr_node->proc != proc) {
		mutex_unlock(&context->context_mgr_node_lock);
		return -EPERM;
		}
		mutex_unlock(&context->context_mgr_node_lock);

		node = binder_get_node_from_ref(proc, handle, true, NULL);
		if (!node)
		return -EINVAL;

		info->strong_count = node->local_strong_refs +
		node->internal_strong_refs;
		info->weak_count = node->local_weak_refs;

		binder_put_node(node);

		return 0;
		}

		static int binder_ioctl_get_node_debug_info(struct binder_proc *proc,
		struct binder_node_debug_info *info)
		{
		@@ -4809,6 +4845,25 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
		}
		break;
		}
		case BINDER_GET_NODE_INFO_FOR_REF: {
		struct binder_node_info_for_ref info;

		if (copy_from_user(&info, ubuf, sizeof(info))) {
		ret = -EFAULT;
		goto err;
		}

		ret = binder_ioctl_get_node_info_for_ref(proc, &info);
		if (ret < 0)
		goto err;

		if (copy_to_user(ubuf, &info, sizeof(info))) {
		ret = -EFAULT;
		goto err;
		}

		break;
		}
		case BINDER_GET_NODE_DEBUG_INFO: {
		struct binder_node_debug_info info;

include/uapi/linux/android/binder.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -247,6 +247,15 @@ struct binder_node_debug_info {
		__u32 has_weak_ref;
		};

		struct binder_node_info_for_ref {
		__u32 handle;
		__u32 strong_count;
		__u32 weak_count;
		__u32 reserved1;
		__u32 reserved2;
		__u32 reserved3;
		};

		#define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read)
		#define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, __s64)
		#define BINDER_SET_MAX_THREADS _IOW('b', 5, __u32)
		@@ -255,6 +264,7 @@ struct binder_node_debug_info {
		#define BINDER_THREAD_EXIT _IOW('b', 8, __s32)
		#define BINDER_VERSION _IOWR('b', 9, struct binder_version)
		#define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info)
		#define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref)

		/*
		* NOTE: Two special error codes you should check for when calling