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

Commit 435b5558 authored by Mike B's avatar Mike B Committed by Bernhard Thoben
Browse files

diag: not finding original commit. adding mutex locks

parent 50745e47

drivers/char/diag/diagchar_core.c

+13 −7
Original line number Diff line number Diff line
@@ -1264,12 +1264,17 @@ long diagchar_compat_ioctl(struct file *filp, 
		result = diag_ioctl_dci_reg(ioarg);

		break;

	case DIAG_IOCTL_DCI_DEINIT:

		mutex_lock(&driver->dci_mutex);

		if (copy_from_user((void *)&client_id, (void __user *)ioarg,

			sizeof(int)))

			sizeof(int))) {

			mutex_unlock(&driver->dci_mutex);

			return -EFAULT;

		}

		dci_client = diag_dci_get_client_entry(client_id);

		if (!dci_client)

		if (!dci_client) {

			mutex_unlock(&driver->dci_mutex);

			return DIAG_DCI_NOT_SUPPORTED;

		}

		result = diag_dci_deinit_client(dci_client);

		mutex_unlock(&driver->dci_mutex);

		break;
@@ -1378,16 +1383,17 @@ long diagchar_ioctl(struct file *filp, 
		result = diag_ioctl_dci_reg(ioarg);

		break;

	case DIAG_IOCTL_DCI_DEINIT:

		mutex_lock(&driver->dci_mutex);

		if (copy_from_user((void *)&client_id, (void __user *)ioarg,

			sizeof(int)))

			sizeof(int))) {

			mutex_unlock(&driver->dci_mutex);

			return -EFAULT;

		}

		dci_client = diag_dci_get_client_entry(client_id);

		if (!dci_client)

		if (!dci_client) {

			mutex_unlock(&driver->dci_mutex);

			return DIAG_DCI_NOT_SUPPORTED;

<<<<<<< HEAD

=======

		}

>>>>>>> 1ede4694d5b2 (diag: Fix for possible dci stale entries)

		result = diag_dci_deinit_client(dci_client);

		mutex_unlock(&driver->dci_mutex);

		break;