[PATCH 0/1] V4L/DVB fix

[PATCH 0/1] V4L/DVB fix

[Mauro Carvalho Chehab]

Linus,

Please pull 'master' from:
        git://git.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git 
master. 

The patch fixes an important bug on V4L core. By doing some ioctls on an 
unexpected order, it is possible to hang the machine without needing to be 
root, causing a DoS.

   - Buf_qbuf: fix: videobuf_queue->stream corruption and lockup

This patch should also be applied also at -stable releases.

Cheers,
Mauro.

V4L/DVB development is hosted at http://linuxtv.org
---

 drivers/media/video/video-buf.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

[PATCH 1/1] V4L/DVB (5123): Buf_qbuf: fix: videobuf_queue->stream corruption and lockup

[Mauro Carvalho Chehab]

From: Oleg Nesterov <oleg@tv-sign.ru>

We are doing ->buf_prepare(buf) before adding buf to q->stream list. This
means that videobuf_qbuf() should not try to re-add a STATE_PREPARED buffer.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

 drivers/media/video/video-buf.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index 635d102..6504a58 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -700,6 +700,7 @@ videobuf_qbuf(struct videobuf_queue *q,
 		goto done;
 	}
 	if (buf->state == STATE_QUEUED ||
+	    buf->state == STATE_PREPARED ||
 	    buf->state == STATE_ACTIVE) {
 		dprintk(1,"qbuf: buffer is already queued or active.\n");
 		goto done;

Re: [PATCH 0/1] V4L/DVB fix

[Mauro Carvalho Chehab]

Linus,


> > Please pull 'master' from:
> >         git://git.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git master
> > It fixes a breakage when compiling on ia64.
> Did you forget to push out again?
Argh! Yes, it weren't pushed on my tree. Should be ok now.

updating 'refs/heads/master'
  from 9202f32558601c2c99ddc438eb3218131d00d413
  to   2a7e9a260ede3b17b5bc25c540a033a45bbf0461
updating 'refs/heads/origin'
  from 9202f32558601c2c99ddc438eb3218131d00d413
  to   4259cb25d436a79bf6b07d8075423573567c211d

Cheers, 
Mauro.

Re: [PATCH 0/1] V4L/DVB fix

[Linus Torvalds]

On Mon, 11 Dec 2006, Mauro Carvalho Chehab wrote:
> 
> Please pull 'master' from:
>         git://git.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git master
> 
> It fixes a breakage when compiling on ia64.

I get "Already up-to-date."

Did you forget to push out again?

		Linus

[PATCH 0/1] V4L/DVB fix

[Mauro Carvalho Chehab]

Linus,

Please pull 'master' from:
        git://git.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git master

It fixes a breakage when compiling on ia64.

Cheers,
Mauro.

V4L/DVB development is hosted at http://linuxtv.org
---

 drivers/media/video/usbvision/usbvision-i2c.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)