Commit 2d9ebe77 authored by Thomas Meyer's avatar Thomas Meyer Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Use memdup_user rather than duplicating its implementation 

This is a little bit restricted to reduce false positives

The semantic patch that makes this change is available
in scripts/coccinelle/api/memdup_user.cocci.

More information about semantic patching is available at
http://coccinelle.lip6.fr/



Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cf4d6b9

drivers/staging/bcm/Bcmchar.c

+12 −25
Original line number Diff line number Diff line
@@ -728,14 +728,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		if (IoBuffer.InputLength > MAX_CNTL_PKT_SIZE)

			return -EINVAL;



		pvBuffer = kmalloc(IoBuffer.InputLength, GFP_KERNEL);

		if (!pvBuffer)

			return -ENOMEM;



		if (copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength)) {

			kfree(pvBuffer);

			return -EFAULT;

		}

		pvBuffer = memdup_user(IoBuffer.InputBuffer,

				       IoBuffer.InputLength);

		if (IS_ERR(pvBuffer))

			return PTR_ERR(pvBuffer);



		down(&Adapter->LowPowerModeSync);

		Status = wait_event_interruptible_timeout(Adapter->lowpower_mode_wait_queue,
@@ -1140,15 +1136,10 @@ cntrlEnd: 
		if (IoBuffer.InputLength < sizeof(ULONG) * 2)

			return -EINVAL;



		pvBuffer = kmalloc(IoBuffer.InputLength, GFP_KERNEL);

		if (!pvBuffer)

			return -ENOMEM;



		/* Get WrmBuffer structure */

		if (copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength)) {

			kfree(pvBuffer);

			return -EFAULT;

		}

		pvBuffer = memdup_user(IoBuffer.InputBuffer,

				       IoBuffer.InputLength);

		if (IS_ERR(pvBuffer))

			return PTR_ERR(pvBuffer);



		pBulkBuffer = (PBULKWRM_BUFFER)pvBuffer;
@@ -1310,14 +1301,10 @@ cntrlEnd: 
			return STATUS_FAILURE;

		}



		pReadData = kzalloc(stNVMReadWrite.uiNumBytes, GFP_KERNEL);

		if (!pReadData)

			return -ENOMEM;



		if (copy_from_user(pReadData, stNVMReadWrite.pBuffer, stNVMReadWrite.uiNumBytes)) {

			kfree(pReadData);

			return -EFAULT;

		}

		pReadData = memdup_user(stNVMReadWrite.pBuffer,

					stNVMReadWrite.uiNumBytes);

		if (IS_ERR(pReadData))

			return PTR_ERR(pReadData);



		do_gettimeofday(&tv0);

		if (IOCTL_BCM_NVM_READ == cmd) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE