Commit b4a6700c authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: ioctl: use sizeof of variable instead of struct type 



Use sizeof(connect_data))) instead of
sizeof(struct mei_connect_client_data) when copying data
between user space and kernel.

There is a possibility of bug when variable type has changed but
corresponding struct passed to the sizeof has not.

Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20200723145927.882743-3-tomas.winkler@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df4b37bc

drivers/misc/mei/main.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2003-2018, Intel Corporation. All rights reserved.

 * Copyright (c) 2003-2020, Intel Corporation. All rights reserved.

 * Intel Management Engine Interface (Intel MEI) Linux driver

 */
@@ -476,7 +476,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data) 
	case IOCTL_MEI_CONNECT_CLIENT:

		dev_dbg(dev->dev, ": IOCTL_MEI_CONNECT_CLIENT.\n");

		if (copy_from_user(&connect_data, (char __user *)data,

				sizeof(struct mei_connect_client_data))) {

				   sizeof(connect_data))) {

			dev_dbg(dev->dev, "failed to copy data from userland\n");

			rets = -EFAULT;

			goto out;
@@ -488,7 +488,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data) 


		/* if all is ok, copying the data back to user. */

		if (copy_to_user((char __user *)data, &connect_data,

				sizeof(struct mei_connect_client_data))) {

				 sizeof(connect_data))) {

			dev_dbg(dev->dev, "failed to copy data to userland\n");

			rets = -EFAULT;

			goto out;