ソースを参照

V4L/DVB (7402): add macro validation for v4l_compat_ioctl32

Added macro CONFIG_COMPAT for v4l_compat_ioctl32.

Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Douglas Schilling Landgraf 17 年 前
コミット
078ff79534
38 ファイル変更76 行追加0 行削除
  1. 2 0
      drivers/media/radio/dsbr100.c
  2. 2 0
      drivers/media/radio/miropcm20-radio.c
  3. 2 0
      drivers/media/radio/radio-aimslab.c
  4. 2 0
      drivers/media/radio/radio-aztech.c
  5. 2 0
      drivers/media/radio/radio-cadet.c
  6. 2 0
      drivers/media/radio/radio-gemtek-pci.c
  7. 2 0
      drivers/media/radio/radio-gemtek.c
  8. 2 0
      drivers/media/radio/radio-maestro.c
  9. 2 0
      drivers/media/radio/radio-maxiradio.c
  10. 2 0
      drivers/media/radio/radio-rtrack2.c
  11. 2 0
      drivers/media/radio/radio-sf16fmi.c
  12. 2 0
      drivers/media/radio/radio-sf16fmr2.c
  13. 2 0
      drivers/media/radio/radio-si470x.c
  14. 2 0
      drivers/media/radio/radio-terratec.c
  15. 2 0
      drivers/media/radio/radio-trust.c
  16. 2 0
      drivers/media/radio/radio-typhoon.c
  17. 2 0
      drivers/media/radio/radio-zoltrix.c
  18. 2 0
      drivers/media/video/arv.c
  19. 2 0
      drivers/media/video/bw-qcam.c
  20. 2 0
      drivers/media/video/c-qcam.c
  21. 2 0
      drivers/media/video/cpia.c
  22. 2 0
      drivers/media/video/cpia2/cpia2_v4l.c
  23. 2 0
      drivers/media/video/et61x251/et61x251_core.c
  24. 2 0
      drivers/media/video/meye.c
  25. 2 0
      drivers/media/video/ov511.c
  26. 2 0
      drivers/media/video/pms.c
  27. 2 0
      drivers/media/video/pwc/pwc-if.c
  28. 2 0
      drivers/media/video/saa5249.c
  29. 2 0
      drivers/media/video/se401.c
  30. 2 0
      drivers/media/video/sn9c102/sn9c102_core.c
  31. 2 0
      drivers/media/video/stradis.c
  32. 2 0
      drivers/media/video/stv680.c
  33. 2 0
      drivers/media/video/usbvideo/usbvideo.c
  34. 2 0
      drivers/media/video/usbvideo/vicam.c
  35. 2 0
      drivers/media/video/w9966.c
  36. 2 0
      drivers/media/video/w9968cf.c
  37. 2 0
      drivers/media/video/zc0301/zc0301_core.c
  38. 2 0
      drivers/media/video/zoran_driver.c

+ 2 - 0
drivers/media/radio/dsbr100.c

@@ -438,7 +438,9 @@ static const struct file_operations usb_dsbr100_fops = {
 	.open		= usb_dsbr100_open,
 	.release	= usb_dsbr100_close,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek		= no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/miropcm20-radio.c

@@ -221,7 +221,9 @@ static const struct file_operations pcm20_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= pcm20_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-aimslab.c

@@ -382,7 +382,9 @@ static const struct file_operations rtrack_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-aztech.c

@@ -346,7 +346,9 @@ static const struct file_operations aztech_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-cadet.c

@@ -563,7 +563,9 @@ static const struct file_operations cadet_fops = {
 	.read		= cadet_read,
 	.ioctl		= video_ioctl2,
 	.poll		= cadet_poll,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-gemtek-pci.c

@@ -368,7 +368,9 @@ static const struct file_operations gemtek_pci_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-gemtek.c

@@ -397,7 +397,9 @@ static const struct file_operations gemtek_fops = {
 	.open		= video_exclusive_open,
 	.release	= video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek		= no_llseek
 };
 

+ 2 - 0
drivers/media/radio/radio-maestro.c

@@ -100,7 +100,9 @@ static const struct file_operations maestro_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-maxiradio.c

@@ -103,7 +103,9 @@ static const struct file_operations maxiradio_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-rtrack2.c

@@ -288,7 +288,9 @@ static const struct file_operations rtrack2_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-sf16fmi.c

@@ -288,7 +288,9 @@ static const struct file_operations fmi_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-sf16fmr2.c

@@ -404,7 +404,9 @@ static const struct file_operations fmr2_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-si470x.c

@@ -1051,7 +1051,9 @@ static const struct file_operations si470x_fops = {
 	.read		= si470x_fops_read,
 	.poll		= si470x_fops_poll,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.open		= si470x_fops_open,
 	.release	= si470x_fops_release,
 };

+ 2 - 0
drivers/media/radio/radio-terratec.c

@@ -360,7 +360,9 @@ static const struct file_operations terratec_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-trust.c

@@ -340,7 +340,9 @@ static const struct file_operations trust_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-typhoon.c

@@ -340,7 +340,9 @@ static const struct file_operations typhoon_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/radio/radio-zoltrix.c

@@ -401,7 +401,9 @@ static const struct file_operations zoltrix_fops =
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl		= video_ioctl2,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/video/arv.c

@@ -747,7 +747,9 @@ static const struct file_operations ar_fops = {
 	.release	= video_exclusive_release,
 	.read		= ar_read,
 	.ioctl		= ar_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek		= no_llseek,
 };
 

+ 2 - 0
drivers/media/video/bw-qcam.c

@@ -898,7 +898,9 @@ static const struct file_operations qcam_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl          = qcam_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.read		= qcam_read,
 	.llseek         = no_llseek,
 };

+ 2 - 0
drivers/media/video/c-qcam.c

@@ -689,7 +689,9 @@ static const struct file_operations qcam_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl          = qcam_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.read		= qcam_read,
 	.llseek         = no_llseek,
 };

+ 2 - 0
drivers/media/video/cpia.c

@@ -3792,7 +3792,9 @@ static const struct file_operations cpia_fops = {
 	.read		= cpia_read,
 	.mmap		= cpia_mmap,
 	.ioctl          = cpia_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/video/cpia2/cpia2_v4l.c

@@ -1927,7 +1927,9 @@ static const struct file_operations fops_template = {
 	.poll		= cpia2_v4l_poll,
 	.ioctl		= cpia2_ioctl,
 	.llseek		= no_llseek,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.mmap		= cpia2_mmap,
 };
 

+ 2 - 0
drivers/media/video/et61x251/et61x251_core.c

@@ -2523,7 +2523,9 @@ static const struct file_operations et61x251_fops = {
 	.open =    et61x251_open,
 	.release = et61x251_release,
 	.ioctl =   et61x251_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.read =    et61x251_read,
 	.poll =    et61x251_poll,
 	.mmap =    et61x251_mmap,

+ 2 - 0
drivers/media/video/meye.c

@@ -1761,7 +1761,9 @@ static const struct file_operations meye_fops = {
 	.release	= meye_release,
 	.mmap		= meye_mmap,
 	.ioctl		= meye_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.poll		= meye_poll,
 	.llseek		= no_llseek,
 };

+ 2 - 0
drivers/media/video/ov511.c

@@ -4659,7 +4659,9 @@ static const struct file_operations ov511_fops = {
 	.read =		ov51x_v4l1_read,
 	.mmap =		ov51x_v4l1_mmap,
 	.ioctl =	ov51x_v4l1_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.llseek =	no_llseek,
 };
 

+ 2 - 0
drivers/media/video/pms.c

@@ -885,7 +885,9 @@ static const struct file_operations pms_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl          = pms_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.read           = pms_read,
 	.llseek         = no_llseek,
 };

+ 2 - 0
drivers/media/video/pwc/pwc-if.c

@@ -159,7 +159,9 @@ static const struct file_operations pwc_fops = {
 	.poll =		pwc_video_poll,
 	.mmap =		pwc_video_mmap,
 	.ioctl =        pwc_video_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.llseek =       no_llseek,
 };
 static struct video_device pwc_template = {

+ 2 - 0
drivers/media/video/saa5249.c

@@ -701,7 +701,9 @@ static const struct file_operations saa_fops = {
 	.open		= saa5249_open,
 	.release       	= saa5249_release,
 	.ioctl          = saa5249_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek         = no_llseek,
 };
 

+ 2 - 0
drivers/media/video/se401.c

@@ -1224,7 +1224,9 @@ static const struct file_operations se401_fops = {
 	.read =         se401_read,
 	.mmap =         se401_mmap,
 	.ioctl =        se401_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.llseek =       no_llseek,
 };
 static struct video_device se401_template = {

+ 2 - 0
drivers/media/video/sn9c102/sn9c102_core.c

@@ -3224,7 +3224,9 @@ static const struct file_operations sn9c102_fops = {
 	.open = sn9c102_open,
 	.release = sn9c102_release,
 	.ioctl = sn9c102_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.read = sn9c102_read,
 	.poll = sn9c102_poll,
 	.mmap = sn9c102_mmap,

+ 2 - 0
drivers/media/video/stradis.c

@@ -1906,7 +1906,9 @@ static const struct file_operations saa_fops = {
 	.open = saa_open,
 	.release = saa_release,
 	.ioctl = saa_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.read = saa_read,
 	.llseek = no_llseek,
 	.write = saa_write,

+ 2 - 0
drivers/media/video/stv680.c

@@ -1394,7 +1394,9 @@ static const struct file_operations stv680_fops = {
 	.read =		stv680_read,
 	.mmap =		stv680_mmap,
 	.ioctl =        stv680_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.llseek =       no_llseek,
 };
 static struct video_device stv680_template = {

+ 2 - 0
drivers/media/video/usbvideo/usbvideo.c

@@ -946,7 +946,9 @@ static const struct file_operations usbvideo_fops = {
 	.read =   usbvideo_v4l_read,
 	.mmap =   usbvideo_v4l_mmap,
 	.ioctl =  usbvideo_v4l_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.llseek = no_llseek,
 };
 static const struct video_device usbvideo_template = {

+ 2 - 0
drivers/media/video/usbvideo/vicam.c

@@ -1066,7 +1066,9 @@ static const struct file_operations vicam_fops = {
 	.read		= vicam_read,
 	.mmap		= vicam_mmap,
 	.ioctl		= vicam_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek		= no_llseek,
 };
 

+ 2 - 0
drivers/media/video/w9966.c

@@ -188,7 +188,9 @@ static const struct file_operations w9966_fops = {
 	.open           = video_exclusive_open,
 	.release        = video_exclusive_release,
 	.ioctl          = w9966_v4l_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.read           = w9966_v4l_read,
 	.llseek         = no_llseek,
 };

+ 2 - 0
drivers/media/video/w9968cf.c

@@ -3461,7 +3461,9 @@ static const struct file_operations w9968cf_fops = {
 	.release = w9968cf_release,
 	.read =    w9968cf_read,
 	.ioctl =   w9968cf_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.mmap =    w9968cf_mmap,
 	.llseek =  no_llseek,
 };

+ 2 - 0
drivers/media/video/zc0301/zc0301_core.c

@@ -1925,7 +1925,9 @@ static const struct file_operations zc0301_fops = {
 	.open =    zc0301_open,
 	.release = zc0301_release,
 	.ioctl =   zc0301_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
+#endif
 	.read =    zc0301_read,
 	.poll =    zc0301_poll,
 	.mmap =    zc0301_mmap,

+ 2 - 0
drivers/media/video/zoran_driver.c

@@ -4644,7 +4644,9 @@ static const struct file_operations zoran_fops = {
 	.open = zoran_open,
 	.release = zoran_close,
 	.ioctl = zoran_ioctl,
+#ifdef CONFIG_COMPAT
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek = no_llseek,
 	.read = zoran_read,
 	.write = zoran_write,