Commit b7de567bf3187ccf776e2fe0e241593cdcba5459

Authored by Jonathan Corbet
Committed by Linus Torvalds
1 parent 1cc5f7142e

[PATCH] VIDIOC_ENUMSTD bug

The v4l2 API documentation for VIDIOC_ENUMSTD says:

	To enumerate all standards applications shall begin at index
	zero, incrementing by one until the driver returns EINVAL.

The actual code, however, tests the index this way:

               if (index<=0 || index >= vfd->tvnormsize) {
                        ret=-EINVAL;

So any application which passes in index=0 gets EINVAL right off the bat
- and, in fact, this is what happens to mplayer.  So I think the
following patch is called for, and maybe even appropriate for a 2.6.18.x
stable release.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/media/video/videodev.c
... ... @@ -836,7 +836,7 @@
836 836 break;
837 837 }
838 838  
839   - if (index<=0 || index >= vfd->tvnormsize) {
  839 + if (index < 0 || index >= vfd->tvnormsize) {
840 840 ret=-EINVAL;
841 841 break;
842 842 }