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

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

Merge "diag: Fix for possible dci stale entries"

parents a65ba2a0 456fd0ee

drivers/char/diag/diag_dci.c

+2 −4
Original line number Diff line number Diff line
@@ -1321,6 +1321,7 @@ void diag_dci_channel_open_work(struct work_struct *work) 
	 * which log entries in the cumulative logs that need

	 * to be updated on the peripheral.

	 */

	mutex_lock(&driver->dci_mutex);

	list_for_each_safe(start, temp, &driver->dci_client_list) {

		entry = list_entry(start, struct diag_dci_client_tbl, track);

		if (entry->client_info.token != DCI_LOCAL_PROC)
@@ -1332,6 +1333,7 @@ void diag_dci_channel_open_work(struct work_struct *work) 
			client_log_mask_ptr += 514;

		}

	}

	mutex_unlock(&driver->dci_mutex);



	mutex_lock(&dci_log_mask_mutex);

	/* Update the appropriate dirty bits in the cumulative mask */
@@ -2821,8 +2823,6 @@ int diag_dci_deinit_client(struct diag_dci_client_tbl *entry) 
	if (!entry)

		return DIAG_DCI_NOT_SUPPORTED;



	mutex_lock(&driver->dci_mutex);



	token = entry->client_info.token;

	/*

	 * Remove the entry from the list before freeing the buffers
@@ -2933,8 +2933,6 @@ int diag_dci_deinit_client(struct diag_dci_client_tbl *entry) 
	}

	queue_work(driver->diag_real_time_wq, &driver->diag_real_time_work);



	mutex_unlock(&driver->dci_mutex);



	return DIAG_DCI_NO_ERROR;

}

drivers/char/diag/diagchar_core.c

+38 −6
Original line number Diff line number Diff line
@@ -421,9 +421,11 @@ static int diag_remove_client_entry(struct file *file) 
	* This will specially help in case of ungraceful exit of any DCI client

	* This call will remove any pending registrations of such client

	*/

	mutex_lock(&driver->dci_mutex);

	dci_entry = dci_lookup_client_entry_pid(current->tgid);

	if (dci_entry)

		diag_dci_deinit_client(dci_entry);

	mutex_unlock(&driver->dci_mutex);



	diag_close_logging_process(current->tgid);
@@ -1982,32 +1984,46 @@ long diagchar_compat_ioctl(struct file *filp, 
			mutex_unlock(&driver->dci_mutex);

			return DIAG_DCI_NOT_SUPPORTED;

		}

		mutex_unlock(&driver->dci_mutex);

		result = diag_dci_deinit_client(dci_client);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_DCI_SUPPORT:

		result = diag_ioctl_dci_support(ioarg);

		break;

	case DIAG_IOCTL_DCI_HEALTH_STATS:

		mutex_lock(&driver->dci_mutex);

		result = diag_ioctl_dci_health_stats(ioarg);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_DCI_LOG_STATUS:

		mutex_lock(&driver->dci_mutex);

		result = diag_ioctl_dci_log_status(ioarg);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_DCI_EVENT_STATUS:

		mutex_lock(&driver->dci_mutex);

		result = diag_ioctl_dci_event_status(ioarg);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_DCI_CLEAR_LOGS:

		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;

		}

		result = diag_dci_clear_log_mask(client_id);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_DCI_CLEAR_EVENTS:

		mutex_lock(&driver->dci_mutex);

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

			sizeof(int)))

			sizeof(int))) {

			mutex_unlock(&driver->dci_mutex);

			return -EFAULT;

		}

		result = diag_dci_clear_event_mask(client_id);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_LSM_DEINIT:

		result = diag_ioctl_lsm_deinit();
@@ -2029,7 +2045,9 @@ long diagchar_compat_ioctl(struct file *filp, 
			result = 1;

		break;

	case DIAG_IOCTL_VOTE_REAL_TIME:

		mutex_lock(&driver->dci_mutex);

		result = diag_ioctl_vote_real_time(ioarg);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_GET_REAL_TIME:

		result = diag_ioctl_get_real_time(ioarg);
@@ -2091,32 +2109,44 @@ long diagchar_ioctl(struct file *filp, 
			mutex_unlock(&driver->dci_mutex);

			return DIAG_DCI_NOT_SUPPORTED;

		}

		mutex_unlock(&driver->dci_mutex);

		result = diag_dci_deinit_client(dci_client);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_DCI_SUPPORT:

		result = diag_ioctl_dci_support(ioarg);

		break;

	case DIAG_IOCTL_DCI_HEALTH_STATS:

		mutex_lock(&driver->dci_mutex);

		result = diag_ioctl_dci_health_stats(ioarg);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_DCI_LOG_STATUS:

		mutex_lock(&driver->dci_mutex);

		result = diag_ioctl_dci_log_status(ioarg);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_DCI_EVENT_STATUS:

		result = diag_ioctl_dci_event_status(ioarg);

		break;

	case DIAG_IOCTL_DCI_CLEAR_LOGS:

		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;

		}

		result = diag_dci_clear_log_mask(client_id);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_DCI_CLEAR_EVENTS:

		mutex_lock(&driver->dci_mutex);

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

			sizeof(int)))

			sizeof(int))) {

			mutex_unlock(&driver->dci_mutex);

			return -EFAULT;

		}

		result = diag_dci_clear_event_mask(client_id);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_LSM_DEINIT:

		result = diag_ioctl_lsm_deinit();
@@ -2138,7 +2168,9 @@ long diagchar_ioctl(struct file *filp, 
			result = 1;

		break;

	case DIAG_IOCTL_VOTE_REAL_TIME:

		mutex_lock(&driver->dci_mutex);

		result = diag_ioctl_vote_real_time(ioarg);

		mutex_unlock(&driver->dci_mutex);

		break;

	case DIAG_IOCTL_GET_REAL_TIME:

		result = diag_ioctl_get_real_time(ioarg);