security builds & testing needed

[Phillip lougher]

Kees,

This is the fix for the "USB: fix DoS in pwc USB video driver
(CVE-2007-5093)" patch in Dapper.

It can be added to git using git-am.

Phillip

>From 06fddb487a1098b5bf691d39d1ec0dedeb678470 Mon Sep 17 00:00:00 2001
From: Phillip Lougher <phillip at ubuntu.com>
Date: Tue, 27 Nov 2007 01:15:16 +0000
Subject: [PATCH] [UBUNTU:usb/media/pwc] Fixup Dos in pwc USB video driver (CVE-2007-5093)

Fix undeclared symbols and make patch consistent with Dapper version of code

Signed-off-by: Phillip Lougher <phillip at canonical.com>
---
 drivers/usb/media/pwc/pwc-if.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c
index c05327d..a49116b 100644
--- a/drivers/usb/media/pwc/pwc-if.c
+++ b/drivers/usb/media/pwc/pwc-if.c
@@ -1231,8 +1231,8 @@ static int pwc_video_close(struct inode *inode, struct file *file)
 			if (i < 0)
 				Err("Failed to power down camera (%d)\n", i);
 		}
-		pdev->vopen--;
-		PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", pdev->vopen);
+		pdev->vopen = 0;
+		Trace(TRACE_OPEN, "<< video_close()\n");
 	} else {
 		pwc_cleanup(pdev);
 		/* Free memory (don't set pdev to 0 just yet) */
@@ -1764,7 +1764,7 @@ static void usb_pwc_disconnect(struct usb_interface *intf)
 		pdev->unplugged = 1;
 	} else {
 		/* Device is closed, so we can safely unregister it */
-		PWC_DEBUG_PROBE("Unregistering video device in disconnect().\n");
+		Trace(TRACE_PROBE, "Unregistering video device in disconnect().\n");
 		pwc_cleanup(pdev);
 		/* Free memory (don't set pdev to 0 just yet) */
 		kfree(pdev);
-- 
1.5.2.5