Commit 3a0e9220 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-6.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are three tiny driver fixes for 6.8-rc3.  They include:

   - Android binder long-term bug with epoll finally being fixed

   - fastrpc driver shutdown bugfix

   - open-dice lockdep fix

  All of these have been in linux-next this week with no reported
  issues"

* tag 'char-misc-6.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  binder: signal epoll threads of self-work
  misc: open-dice: Fix spurious lockdep warning
  misc: fastrpc: Mark all sessions as invalid in cb_remove
parents 02149609 97830f3c

drivers/android/binder.c

+10 −0
Original line number Diff line number Diff line
@@ -478,6 +478,16 @@ binder_enqueue_thread_work_ilocked(struct binder_thread *thread, 
{

	WARN_ON(!list_empty(&thread->waiting_thread_node));

	binder_enqueue_work_ilocked(work, &thread->todo);



	/* (e)poll-based threads require an explicit wakeup signal when

	 * queuing their own work; they rely on these events to consume

	 * messages without I/O block. Without it, threads risk waiting

	 * indefinitely without handling the work.

	 */

	if (thread->looper & BINDER_LOOPER_STATE_POLL &&

	    thread->pid == current->pid && !thread->process_todo)

		wake_up_interruptible_sync(&thread->wait);



	thread->process_todo = true;

}

drivers/misc/fastrpc.c

+1 −1
Original line number Diff line number Diff line
@@ -2191,7 +2191,7 @@ static int fastrpc_cb_remove(struct platform_device *pdev) 
	int i;



	spin_lock_irqsave(&cctx->lock, flags);

	for (i = 1; i < FASTRPC_MAX_SESSIONS; i++) {

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

		if (cctx->session[i].sid == sess->sid) {

			cctx->session[i].valid = false;

			cctx->sesscount--;

drivers/misc/open-dice.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ static int __init open_dice_probe(struct platform_device *pdev) 
		return -ENOMEM;



	*drvdata = (struct open_dice_drvdata){

		.lock = __MUTEX_INITIALIZER(drvdata->lock),

		.rmem = rmem,

		.misc = (struct miscdevice){

			.parent	= dev,
@@ -150,6 +149,7 @@ static int __init open_dice_probe(struct platform_device *pdev) 
			.mode	= 0600,

		},

	};

	mutex_init(&drvdata->lock);



	/* Index overflow check not needed, misc_register() will fail. */

	snprintf(drvdata->name, sizeof(drvdata->name), DRIVER_NAME"%u", dev_idx++);