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

Commit 36c89c0a authored by Mathieu Maret's avatar Mathieu Maret Committed by Greg Kroah-Hartman
Browse files

staging: binder: add __user annotation in binder.c 



Add __user to binder_version to correct sparse warning.
Reduce line size to fit to coding style.

Signed-off-by: default avatarMathieu Maret <mathieu.maret@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 53d719f6

drivers/staging/android/binder.c

+6 −2
Original line number Diff line number Diff line
@@ -2683,16 +2683,20 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		binder_free_thread(proc, thread);

		thread = NULL;

		break;

	case BINDER_VERSION:

	case BINDER_VERSION: {

		struct binder_version __user *ver = ubuf;



		if (size != sizeof(struct binder_version)) {

			ret = -EINVAL;

			goto err;

		}

		if (put_user(BINDER_CURRENT_PROTOCOL_VERSION, &((struct binder_version *)ubuf)->protocol_version)) {

		if (put_user(BINDER_CURRENT_PROTOCOL_VERSION,

			     &ver->protocol_version)) {

			ret = -EINVAL;

			goto err;

		}

		break;

	}

	default:

		ret = -EINVAL;

		goto err;