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

Commit ad6e46c9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "compat_qcedev: Fix accessing userspace memory in kernel space"

parents b8c03353 85ac0155

drivers/crypto/msm/compat_qcedev.c

+1 −9
Original line number Diff line number Diff line 
/*

 * QTI CE 32-bit compatibility syscall for 64-bit systems

 *

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2015, 2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -97,7 +97,6 @@ static int compat_get_qcedev_vbuf_info( 


	for (i = 0; i < QCEDEV_MAX_BUFFERS; i++) {

		err |= get_user(vaddr, &vbuf32->src[i].vaddr);

		vbuf->src[i].vaddr = NULL;

		err |= put_user(vaddr, (compat_uptr_t *)&vbuf->src[i].vaddr);

		err |= get_user(len, &vbuf32->src[i].len);

		err |= put_user(len, &vbuf->src[i].len);
@@ -105,7 +104,6 @@ static int compat_get_qcedev_vbuf_info( 


	for (i = 0; i < QCEDEV_MAX_BUFFERS; i++) {

		err |= get_user(vaddr, &vbuf32->dst[i].vaddr);

		vbuf->dst[i].vaddr = NULL;

		err |= put_user(vaddr, (compat_uptr_t *)&vbuf->dst[i].vaddr);

		err |= get_user(len, &vbuf32->dst[i].len);

		err |= put_user(len, &vbuf->dst[i].len);
@@ -123,7 +121,6 @@ static int compat_put_qcedev_vbuf_info( 


	for (i = 0; i < QCEDEV_MAX_BUFFERS; i++) {

		err |= get_user(vaddr, (compat_uptr_t *)&vbuf->src[i].vaddr);

		vbuf32->src[i].vaddr = 0;

		err |= put_user(vaddr, &vbuf32->src[i].vaddr);

		err |= get_user(len, &vbuf->src[i].len);

		err |= put_user(len, &vbuf32->src[i].len);
@@ -131,7 +128,6 @@ static int compat_put_qcedev_vbuf_info( 


	for (i = 0; i < QCEDEV_MAX_BUFFERS; i++) {

		err |= get_user(vaddr, (compat_uptr_t *)&vbuf->dst[i].vaddr);

		vbuf32->dst[i].vaddr = 0;

		err |= put_user(vaddr, &vbuf32->dst[i].vaddr);

		err |= get_user(len, &vbuf->dst[i].len);

		err |= put_user(len, &vbuf32->dst[i].len);
@@ -276,7 +272,6 @@ static int compat_get_qcedev_sha_op_req( 


	for (i = 0; i < QCEDEV_MAX_BUFFERS; i++) {

		err |= get_user(vaddr, &data32->data[i].vaddr);

		data->data[i].vaddr = 0;

		err |= put_user(vaddr, (compat_uptr_t *)&data->data[i].vaddr);

		err |= get_user(len, &data32->data[i].len);

		err |= put_user(len, &data->data[i].len);
@@ -295,7 +290,6 @@ static int compat_get_qcedev_sha_op_req( 
	err |= get_user(diglen, &data32->diglen);

	err |= put_user(diglen, &data->diglen);

	err |= get_user(authkey, &data32->authkey);

	data->authkey = NULL;

	err |= put_user(authkey, (compat_uptr_t *)&data->authkey);

	err |= get_user(authklen, &data32->authklen);

	err |= put_user(authklen, &data->authklen);
@@ -322,7 +316,6 @@ static int compat_put_qcedev_sha_op_req( 


	for (i = 0; i < QCEDEV_MAX_BUFFERS; i++) {

		err |= get_user(vaddr, (compat_uptr_t *)&data->data[i].vaddr);

		data32->data[i].vaddr = 0;

		err |= put_user(vaddr, &data32->data[i].vaddr);

		err |= get_user(len, &data->data[i].len);

		err |= put_user(len, &data32->data[i].len);
@@ -341,7 +334,6 @@ static int compat_put_qcedev_sha_op_req( 
	err |= get_user(diglen, &data->diglen);

	err |= put_user(diglen, &data32->diglen);

	err |= get_user(authkey, (compat_uptr_t *)&data->authkey);

	data32->authkey = 0;

	err |= put_user(authkey, &data32->authkey);

	err |= get_user(authklen, &data->authklen);

	err |= put_user(authklen, &data32->authklen);