Skip to contentSkip to conversation

CAN-2004-0075 still valid for 2.6?

PATCH In review Marc-Christian Petersen 2 participants 2 messages Mar 20, 2004 USB

lore
Share & tools
lore

Marc-Christian Petersen

author
#0 lore raw

PATCH 1/1 CAN-2004-0075 still valid for 2.6?

Hi Greg,

seems $subject is still valid for 2.6, no? - 2.4 got a fix 11 weeks ago.

See this:
http://linux.bkbits.net:8080/linux-2.4/diffs/drivers/usb/[email protected]?nav=index.html|
src/|src/drivers|src/drivers/usb|hist/drivers/usb/vicam.c

Please apply.

ciao, Marc

# drivers/usb/media/vicam.c |   13 ++++++++++---
# 1 files changed, 10 insertions(+), 3 deletions(-)
usb/media/vicam.c renamed from drivers/usb/media/vicam.c +10 -3
diff -urN linux-old/drivers/usb/media/vicam.c linux-wolk-for-2.6drivers/usb/media/vicam.c
@@ -653,12 +653,19 @@
 	case VIDIOCSWIN:
 		{
 
-			struct video_window *vw = (struct video_window *) arg;
-			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
+			struct video_window vw;
 
-			if ( vw->width != 320 || vw->height != 240 )
+			if (copy_from_user(&vw, arg, sizeof(vw)))
+			{
 				retval = -EFAULT;
+				break;
+			}
+
+			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
 			
+			if ( vw.width != 320 || vw.height != 240 )
+				retval = -EFAULT;
+
 			break;
 		}
#1 lore raw
Quoted 19 lines · Marc-Christian Petersen

Hi Greg,

seems $subject is still valid for 2.6, no? - 2.4 got a fix 11 weeks ago.

See this:
http://linux.bkbits.net:8080/linux-2.4/diffs/drivers/usb/[email protected]?nav=index.html|
src/|src/drivers|src/drivers/usb|hist/drivers/usb/vicam.c

Please apply.

ciao, Marc

# drivers/usb/media/vicam.c |   13 ++++++++++---
# 1 files changed, 10 insertions(+), 3 deletions(-)

diff -urN linux-old/drivers/usb/media/vicam.c linux-wolk-for-2.6drivers/usb/media/vicam.c

usb/media/vicam.c line 659

Quoted 10 lines
usb/media/vicam.c renamed from drivers/usb/media/vicam.c +3 -3
@@ -653,12 +653,19 @@
 	case VIDIOCSWIN:
 		{
 
-			struct video_window *vw = (struct video_window *) arg;
-			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
+			struct video_window vw;
 
-			if ( vw->width != 320 || vw->height != 240 )
+			if (copy_from_user(&vw, arg, sizeof(vw)))
+			{

Care to implement proper coding style here?

And for some reason I thought this was already fixed in 2.6... guess not.

thanks,

greg k-h