drivers/media/video: move dereference after NULL test
PATCH 1/7 drivers/media/video: move dereference after NULL test
From: Julia Lawall <[email protected]>
In quickcam_messenger.c, if the NULL test on uvd is needed, then the dereference should be after the NULL test.
In vpif_display.c, std_info is initialized to the address of a structure field. This seems unlikely to be NULL. If it could somehow be NULL, then the assignment should be moved after the NULL test. Alternatively, perhaps the NULL test is intended to test std_info->stdid rather than std_info?
In saa7134-alsa.c, the function is only called from one place, where the chip argument has already been dereferenced. On the other hand, if it should be kept, then card should be initialized after it.
A simplified version of the semantic match that detects this problem is as follows (http://coccinelle.lip6.fr/):
// <smpl>
@match exists@
expression x, E;
identifier fld;
@@
* x->fld
... when != \(x = E\|&x\)
* x == NULL
// </smpl>
---
drivers/media/video/davinci/vpif_display.c | 2 -- drivers/media/video/saa7134/saa7134-alsa.c | 2 -- drivers/media/video/usbvideo/quickcam_messenger.c | 3 ++- 3 files changed, 2 insertions(+), 5 deletions(-)
drivers/media/video/davinci/vpif_display.c renamed from drivers/media/video/davinci/vpif_display.c~drivers-media-video-move-dereference-after-null-test +0 -2
@@ -383,8 +383,6 @@ static int vpif_get_std_info(struct chanint index; std_info->stdid = vid_ch->stdid; -if (!std_info) -return -1 ;for (index =0 ; index <ARRAY_SIZE (ch_params); index++) { config = &ch_params[index];
drivers/media/video/saa7134/saa7134-alsa.c renamed from drivers/media/video/saa7134/saa7134-alsa.c~drivers-media-video-move-dereference-after-null-test +0 -2
@@ -1011,8 +1011,6 @@ static int snd_card_saa7134_new_mixer(snunsigned int idx;int err, addr; -if (snd_BUG_ON (!chip)) -return -EINVAL ;strcpy (card->mixername,"SAA7134 Mixer" );for (idx =0 ; idx <ARRAY_SIZE (snd_saa7134_volume_controls); idx++) {
drivers/media/video/usbvideo/quickcam_messenger.c renamed from drivers/media/video/usbvideo/quickcam_messenger.c~drivers-media-video-move-dereference-after-null-test +2 -1
@@ -692,12 +692,13 @@ static int qcm_start_data(struct uvd *uvstatic void qcm_stop_data (struct uvd *uvd) { -struct qcm *cam = (struct qcm *) uvd->user_data; +struct qcm *cam;int i, j;int ret;if ((uvd ==NULL ) || (!uvd->streaming) || (uvd->dev ==NULL ))return ; + cam = (struct qcm *) uvd->user_data; ret =qcm_camera_off (uvd);if (ret)
_
Hi Julia,
Quoted 7 lines
From: Julia Lawall <[email protected]>
diff -puN
drivers/media/video/davinci/vpif_display.c~drivers-media-video-move-dereference-after-null-testdrivers/media/video/davinci/vpif_display.c
drivers/media/video/davinci/vpif_display.c static int vpif_get_std_info(struct chan · line 388
Quoted 8 lines
drivers/media/video/davinci/vpif_display.c renamed from drivers/media/video/davinci/vpif_display.c~drivers-media-video-move-dereference-after-null-test +0
-2@@ -383,8 +383,6 @@ static int vpif_get_std_info(struct chanint index; std_info->stdid = vid_ch->stdid; -if (!std_info) -return -1 ;for (index =0 ; index <ARRAY_SIZE (ch_params); index++) { config = &ch_params[index];
IMO, the better would be to move the if to happen before the usage of std_info, and make it return a proper error code, instead of -1.
Murali,
Any comments?
drivers/media/video/saa7134/saa7134-alsa.c static int snd_card_saa7134_new_mixer(sn · line 1014
Quoted 10 lines
diff -puN
drivers/media/video/saa7134/saa7134-alsa.c~drivers-media-video-move-dereference-after-null-testdrivers/media/video/saa7134/saa7134-alsa.cdrivers/media/video/saa7134/saa7134-alsa.c renamed from drivers/media/video/saa7134/saa7134-alsa.c~drivers-media-video-move-dereference-after-null-test +0
-2@@ -1011,8 +1011,6 @@ static int snd_card_saa7134_new_mixer(snunsigned int idx;int err, addr; -if (snd_BUG_ON (!chip)) -return -EINVAL ;strcpy (card->mixername,"SAA7134 Mixer" );
The better here is to keep the BUG_ON and moving this initialization:
struct snd_card *card = chip->card;
to happen after the test.
Quoted 10 lines
drivers/media/video/saa7134/saa7134-alsa.c renamed from drivers/media/video/saa7134/saa7134-alsa.c~drivers-media-video-move-dereference-after-null-test +0
-0for (idx =0 ; idx <ARRAY_SIZE (snd_saa7134_volume_controls); idx++) {diff -puN
drivers/media/video/usbvideo/quickcam_messenger.c~drivers-media-video-move-dereference-after-null-testdrivers/media/video/usbvideo/quickcam_messenger.cdrivers/media/video/usbvideo/quickcam_messenger.c renamed from drivers/media/video/usbvideo/quickcam_messenger.c~drivers-media-video-move-dereference-after-null-test +0
-1@@ -692,12 +692,13 @@ static int qcm_start_data(struct uvd *uvstatic void qcm_stop_data (struct uvd *uvd) { -struct qcm *cam = (struct qcm *) uvd->user_data;
drivers/media/video/usbvideo/quickcam_messenger.c static int qcm_start_data(struct uvd *uv · line 704
Quoted 10 lines
drivers/media/video/usbvideo/quickcam_messenger.c renamed from drivers/media/video/usbvideo/quickcam_messenger.c~drivers-media-video-move-dereference-after-null-test +2
-0+struct qcm *cam;int i, j;int ret;if ((uvd ==NULL ) || (!uvd->streaming) || (uvd->dev ==NULL ))return ; + cam = (struct qcm *) uvd->user_data; ret =qcm_camera_off (uvd);if (ret)
OK.
Cheers,
Mauro
Quoted 15 lines · Mauro Carvalho Chehab
Hi Julia,
Quoted 13 lines
From: Julia Lawall <[email protected]>
diff -puN
drivers/media/video/davinci/vpif_display.c~drivers-media-video-move-dereference-after-null-testdrivers/media/video/davinci/vpif_display.cdrivers/media/video/davinci/vpif_display.c renamed from drivers/media/video/davinci/vpif_display.c~drivers-media-video-move-dereference-after-null-test +0
-2@@ -383,8 +383,6 @@ static int vpif_get_std_info(struct chanint index; std_info->stdid = vid_ch->stdid; -if (!std_info) -return -1 ;
Quoted 5 lines
drivers/media/video/davinci/vpif_display.c static int vpif_get_std_info(struct chan · line 388
Quoted 2 lines
drivers/media/video/davinci/vpif_display.c renamed from drivers/media/video/davinci/vpif_display.c~drivers-media-video-move-dereference-after-null-test +0
-0for (index =0 ; index <ARRAY_SIZE (ch_params); index++) { config = &ch_params[index];IMO, the better would be to move the if to happen before the usage of
std_info, and make it return a proper error code, instead of -1.
The initializations are as follows:
static int vpif_get_std_info(struct channel_obj *ch)
{
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
struct video_obj *vid_ch = &ch->video;
struct vpif_params *vpifparams = &ch->vpifparams;
struct vpif_channel_config_params *std_info = &vpifparams->std_info;While std_info could be an invalid address, I don't think it would be likely to be NULL. An option would be to test whether ch is NULL. But the function is static, and at all of the call sites either ch or a pointer derived from it has already been dereferenced, so perhaps the test is not necessary.
julia