[kernel] r15248 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sat Feb 20 14:27:40 2010
New Revision: 15248

Log:
yealink: Reliably kill URBs, fixing potential deadlock (Closes: #570532)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/yealink-reliably-kill-urbs.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/22

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sat Feb 20 13:36:28 2010	(r15247)
+++ dists/lenny/linux-2.6/debian/changelog	Sat Feb 20 14:27:40 2010	(r15248)
@@ -31,6 +31,7 @@
     (Closes: #568317)
   * [xen][i386] Fix kernel logging via userspace (Closes: #568561)
     (regression due to fix for #510478)
+  * yealink: Reliably kill URBs, fixing potential deadlock (Closes: #570532)
 
   [ dann frazier ]
   * Add be2net driver (Closes: #570428)

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/yealink-reliably-kill-urbs.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/yealink-reliably-kill-urbs.patch	Sat Feb 20 14:27:40 2010	(r15248)
@@ -0,0 +1,124 @@
+From b4ecda3e965a87881a94017cb0cd484d65799261 Mon Sep 17 00:00:00 2001
+From: Oliver Neukum <oliver at neukum.org>
+Date: Thu, 3 Jul 2008 12:02:03 -0400
+Subject: [PATCH] Input: yealink - reliably kill urbs
+
+Yealink uses two URBs that submit each other. This arrangement
+cannot be reliably killed with usb_kill_urb() alone, as there's
+a window during which the wrong URB may be killed. The fix is
+to introduce a flag.
+
+[dtor at mail.ru: remove spinlock, flag alone should be enough]
+[bwh: revert __func__ to __FUNCTION__ for 2.6.26]
+Signed-off-by: Oliver Neukum <oneukum at suse.de>
+Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
+---
+ drivers/input/misc/yealink.c |   44 +++++++++++++++++++++++++++--------------
+ 1 files changed, 29 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
+index 8a949e7..facefd3 100644
+--- a/drivers/input/misc/yealink.c
++++ b/drivers/input/misc/yealink.c
+@@ -119,6 +119,8 @@ struct yealink_dev {
+ 	u8 lcdMap[ARRAY_SIZE(lcdMap)];	/* state of LCD, LED ... */
+ 	int key_code;			/* last reported key	 */
+ 
++	unsigned int shutdown:1;
++
+ 	int	stat_ix;
+ 	union {
+ 		struct yld_status s;
+@@ -424,10 +426,10 @@ send_update:
+ static void urb_irq_callback(struct urb *urb)
+ {
+ 	struct yealink_dev *yld = urb->context;
+-	int ret;
++	int ret, status = urb->status;
+ 
+-	if (urb->status)
+-		err("%s - urb status %d", __FUNCTION__, urb->status);
++	if (status)
++		err("%s - urb status %d", __FUNCTION__, status);
+ 
+ 	switch (yld->irq_data->cmd) {
+ 	case CMD_KEYPRESS:
+@@ -447,32 +449,37 @@ static void urb_irq_callback(struct urb *urb)
+ 
+ 	yealink_do_idle_tasks(yld);
+ 
+-	ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
+-	if (ret)
+-		err("%s - usb_submit_urb failed %d", __FUNCTION__, ret);
++	if (!yld->shutdown) {
++		ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
++		if (ret && ret != -EPERM)
++			err("%s - usb_submit_urb failed %d", __FUNCTION__, ret);
++	}
+ }
+ 
+ static void urb_ctl_callback(struct urb *urb)
+ {
+ 	struct yealink_dev *yld = urb->context;
+-	int ret;
++	int ret = 0, status = urb->status;
+ 
+-	if (urb->status)
+-		err("%s - urb status %d", __FUNCTION__, urb->status);
++	if (status)
++		err("%s - urb status %d", __FUNCTION__, status);
+ 
+ 	switch (yld->ctl_data->cmd) {
+ 	case CMD_KEYPRESS:
+ 	case CMD_SCANCODE:
+ 		/* ask for a response */
+-		ret = usb_submit_urb(yld->urb_irq, GFP_ATOMIC);
++		if (!yld->shutdown)
++			ret = usb_submit_urb(yld->urb_irq, GFP_ATOMIC);
+ 		break;
+ 	default:
+ 		/* send new command */
+ 		yealink_do_idle_tasks(yld);
+-		ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
++		if (!yld->shutdown)
++			ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
++		break;
+ 	}
+ 
+-	if (ret)
++	if (ret && ret != -EPERM)
+ 		err("%s - usb_submit_urb failed %d", __FUNCTION__, ret);
+ }
+ 
+@@ -531,8 +538,18 @@ static void input_close(struct input_dev *dev)
+ {
+ 	struct yealink_dev *yld = input_get_drvdata(dev);
+ 
++	yld->shutdown = 1;
++	/*
++	 * Make sure the flag is seen by other CPUs before we start
++	 * killing URBs so new URBs won't be submitted
++	 */
++	smp_wmb();
++
+ 	usb_kill_urb(yld->urb_ctl);
+ 	usb_kill_urb(yld->urb_irq);
++
++	yld->shutdown = 0;
++	smp_wmb();
+ }
+ 
+ /*******************************************************************************
+@@ -809,9 +826,6 @@ static int usb_cleanup(struct yealink_dev *yld, int err)
+ 	if (yld == NULL)
+ 		return err;
+ 
+-	usb_kill_urb(yld->urb_irq);	/* parameter validation in core/urb */
+-	usb_kill_urb(yld->urb_ctl);	/* parameter validation in core/urb */
+-
+         if (yld->idev) {
+ 		if (err)
+ 			input_free_device(yld->idev);
+-- 
+1.6.6.2
+

Modified: dists/lenny/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/22	Sat Feb 20 13:36:28 2010	(r15247)
+++ dists/lenny/linux-2.6/debian/patches/series/22	Sat Feb 20 14:27:40 2010	(r15248)
@@ -20,4 +20,4 @@
 + bugfix/all/saa7134-fix-deadlock.patch
 + features/all/add-be2net.patch
 + bugfix/x86/fix-vmi-clocksource.patch
-
++ bugfix/all/yealink-reliably-kill-urbs.patch